From 5fee68f80d5c15eb10435a3f5127413aa7f4eeb7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 14 May 2022 12:52:40 -0400
Subject: [PATCH 1/2] Drop the quit-mnemonic reftest

I can't quite figure out what this test was meant
to test, and how to make it do so in a way that
does not fall afoul of rendering issues in the GL
renderer and rounding differences in pango.

Can't win with reftests.
---
 testsuite/reftests/meson.build          |  3 ---
 testsuite/reftests/quit-mnemonic.css    |  3 ---
 testsuite/reftests/quit-mnemonic.ref.ui | 15 -----------
 testsuite/reftests/quit-mnemonic.ui     | 35 -------------------------
 4 files changed, 56 deletions(-)
 delete mode 100644 testsuite/reftests/quit-mnemonic.css
 delete mode 100644 testsuite/reftests/quit-mnemonic.ref.ui
 delete mode 100644 testsuite/reftests/quit-mnemonic.ui

diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index 0b6d0fa84a..791cbe5ca0 100644
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -482,9 +482,6 @@ testdata = [
   'pseudoclass-on-parent.css',
   'pseudoclass-on-parent.ref.ui',
   'pseudoclass-on-parent.ui',
-  'quit-mnemonic.css',
-  'quit-mnemonic.ref.ui',
-  'quit-mnemonic.ui',
   'repeating-radial-gradient-at-beginning.css',
   'repeating-radial-gradient-at-beginning.ref.ui',
   'repeating-radial-gradient-at-beginning.ui',
diff --git a/testsuite/reftests/quit-mnemonic.css b/testsuite/reftests/quit-mnemonic.css
deleted file mode 100644
index 127d7cc244..0000000000
--- a/testsuite/reftests/quit-mnemonic.css
+++ /dev/null
@@ -1,3 +0,0 @@
-* {
-    padding: 0;
-}
diff --git a/testsuite/reftests/quit-mnemonic.ref.ui b/testsuite/reftests/quit-mnemonic.ref.ui
deleted file mode 100644
index 2a3b9f669a..0000000000
--- a/testsuite/reftests/quit-mnemonic.ref.ui
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window1">
-    <property name="decorated">0</property>
-    <child>
-      <object class="GtkLabel" id="label1">
-        <property name="label" translatable="yes">Quit
-</property>
-        <attributes>
-          <attribute name="underline" value="low" start="0" end="1"></attribute>
-        </attributes>
-      </object>
-    </child>
-  </object>
-</interface>
diff --git a/testsuite/reftests/quit-mnemonic.ui b/testsuite/reftests/quit-mnemonic.ui
deleted file mode 100644
index 703715883f..0000000000
--- a/testsuite/reftests/quit-mnemonic.ui
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window1">
-    <property name="decorated">0</property>
-    <child>
-      <object class="GtkGrid" id="grid1">
-        <child>
-          <object class="GtkLabel" id="label1">
-            <property name="label" translatable="yes">Quit</property>
-            <attributes>
-              <attribute name="underline" value="low" start="0" end="1"></attribute>
-            </attributes>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">0</property>
-              <property name="column-span">1</property>
-              <property name="row-span">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label2">
-            <property name="label" translatable="yes"> </property>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">1</property>
-              <property name="column-span">1</property>
-              <property name="row-span">1</property>
-            </layout>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

From 224a8390eb83d8791a509c7501695f953a4ced2c Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Mon, 16 May 2022 22:26:09 +0200
Subject: [PATCH 2/2] testsuite: Add tests for label overdraw

This brings back a subset of what quit-mnemonic.ui tested for, but
trying a lot harder to trigger the label overdrawing its allocation,
which will cause the text to be cut off when clipping is happening.

It should not be an issue at all with GTK4, but keeping that test around
is a good idea.
---
 .../reftests/label-overdraw-horizontal.ref.ui   | 16 ++++++++++++++++
 testsuite/reftests/label-overdraw-horizontal.ui | 17 +++++++++++++++++
 .../reftests/label-overdraw-vertical.ref.ui     | 14 ++++++++++++++
 testsuite/reftests/label-overdraw-vertical.ui   | 13 +++++++++++++
 testsuite/reftests/meson.build                  |  4 ++++
 5 files changed, 64 insertions(+)
 create mode 100644 testsuite/reftests/label-overdraw-horizontal.ref.ui
 create mode 100644 testsuite/reftests/label-overdraw-horizontal.ui
 create mode 100644 testsuite/reftests/label-overdraw-vertical.ref.ui
 create mode 100644 testsuite/reftests/label-overdraw-vertical.ui

diff --git a/testsuite/reftests/label-overdraw-horizontal.ref.ui b/testsuite/reftests/label-overdraw-horizontal.ref.ui
new file mode 100644
index 0000000000..b74f68bbf9
--- /dev/null
+++ b/testsuite/reftests/label-overdraw-horizontal.ref.ui
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="decorated">0</property>
+    <property name="width-request">100</property>
+    <child>
+      <object class="GtkLabel">
+        <property name="label">letter is off</property>
+        <property name="xalign">0</property>
+        <attributes>
+          <attribute name="style" value="italic" start="0" end="-1"></attribute>
+        </attributes>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/label-overdraw-horizontal.ui b/testsuite/reftests/label-overdraw-horizontal.ui
new file mode 100644
index 0000000000..218fc4777a
--- /dev/null
+++ b/testsuite/reftests/label-overdraw-horizontal.ui
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="decorated">0</property>
+    <property name="width-request">100</property>
+    <child>
+      <object class="GtkLabel">
+        <property name="label">letter is off</property>
+        <property name="halign">start</property>
+        <property name="xalign">0</property>
+        <attributes>
+          <attribute name="style" value="italic" start="0" end="-1"></attribute>
+        </attributes>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/label-overdraw-vertical.ref.ui b/testsuite/reftests/label-overdraw-vertical.ref.ui
new file mode 100644
index 0000000000..804965de4d
--- /dev/null
+++ b/testsuite/reftests/label-overdraw-vertical.ref.ui
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="decorated">0</property>
+    <property name="height-request">100</property>
+    <child>
+      <object class="GtkLabel">
+        <property name="label" translatable="yes">T̰̰̰hree tildes below
+</property>
+        <property name="valign">start</property>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/label-overdraw-vertical.ui b/testsuite/reftests/label-overdraw-vertical.ui
new file mode 100644
index 0000000000..309a87e808
--- /dev/null
+++ b/testsuite/reftests/label-overdraw-vertical.ui
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkWindow">
+    <property name="decorated">0</property>
+    <property name="height-request">100</property>
+    <child>
+      <object class="GtkLabel">
+        <property name="label" translatable="yes">T̰̰̰hree tildes below</property>
+        <property name="valign">start</property>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index 791cbe5ca0..301f8bd0c5 100644
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -392,6 +392,10 @@ testdata = [
   'label-huge-max-width-chars.ui',
   'label-max-width-chars-and-halign-and-infinite-width.ui',
   'label-max-width-chars-and-halign-and-infinite-width.ref.ui',
+  'label-overdraw-horizontal.ref.ui',
+  'label-overdraw-horizontal.ui',
+  'label-overdraw-vertical.ref.ui',
+  'label-overdraw-vertical.ui',
   'label-shadows.css',
   'label-shadows.ref.ui',
   'label-shadows.ui',