From 7671c1074b524fb56a6dde29180faa595d358050 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 22 Oct 2020 19:59:21 -0400
Subject: [PATCH] Tweak focus tests

These tests are a bit fragile because the initial focus
that is taken depends on what ends up in the center of
the window, horizontally or vertically, which depends
on things like fonts, or theme spacing.

This commit makes some tweaks to push things in the
widget-factory example around far enough to make the
tests work again.

We should figure out a way to make this more robust.
---
 testsuite/gtk/focus-chain/widget-factory.ui  | 8 ++++----
 testsuite/gtk/focus-chain/widget-factory2.ui | 4 ++--
 testsuite/gtk/focus-chain/widget-factory3.ui | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/testsuite/gtk/focus-chain/widget-factory.ui b/testsuite/gtk/focus-chain/widget-factory.ui
index f3aa01b9fe..b5e1898497 100644
--- a/testsuite/gtk/focus-chain/widget-factory.ui
+++ b/testsuite/gtk/focus-chain/widget-factory.ui
@@ -847,7 +847,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkFontButton" id="fontbutton1">
                                 <property name="receives-default">1</property>
-                                <property name="level">family|style|size|features|variations</property>
+                                <property name="level">family|size|features|variations</property>
                               </object>
                             </child>
                             <child>
@@ -1013,7 +1013,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="digits">-1</property>
+                                        <property name="digits">1</property>
                                         <property name="draw-value">1</property>
                                         <property name="halign">end</property>
                                       </object>
@@ -1026,7 +1026,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="digits">-1</property>
+                                        <property name="digits">1</property>
                                         <property name="draw-value">1</property>
                                         <property name="halign">start</property>
                                       </object>
@@ -1081,7 +1081,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 </style>
                                 <child type="label">
                                   <object class="GtkLabel" id="label17">
-                                    <property name="label" translatable="yes">&lt;b&gt;Groove&lt;/b&gt;</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Groove, Groove, Groove&lt;/b&gt;</property>
                                     <property name="use-markup">1</property>
                                   </object>
                                 </child>
diff --git a/testsuite/gtk/focus-chain/widget-factory2.ui b/testsuite/gtk/focus-chain/widget-factory2.ui
index 3f5c3bb0d3..df73b1f642 100644
--- a/testsuite/gtk/focus-chain/widget-factory2.ui
+++ b/testsuite/gtk/focus-chain/widget-factory2.ui
@@ -1014,7 +1014,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="digits">-1</property>
+                                        <property name="digits">1</property>
                                         <property name="draw-value">1</property>
                                         <property name="halign">end</property>
                                       </object>
@@ -1027,7 +1027,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="digits">-1</property>
+                                        <property name="digits">1</property>
                                         <property name="draw-value">1</property>
                                         <property name="halign">start</property>
                                       </object>
diff --git a/testsuite/gtk/focus-chain/widget-factory3.ui b/testsuite/gtk/focus-chain/widget-factory3.ui
index de944471ef..8b0a159418 100644
--- a/testsuite/gtk/focus-chain/widget-factory3.ui
+++ b/testsuite/gtk/focus-chain/widget-factory3.ui
@@ -1014,7 +1014,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="digits">-1</property>
+                                        <property name="digits">1</property>
                                         <property name="draw-value">1</property>
                                         <property name="halign">end</property>
                                       </object>
@@ -1027,7 +1027,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="adjustment">adjustment1</property>
                                         <property name="restrict-to-fill-level">0</property>
                                         <property name="fill-level">75</property>
-                                        <property name="digits">-1</property>
+                                        <property name="digits">1</property>
                                         <property name="draw-value">1</property>
                                         <property name="halign">start</property>
                                       </object>