From 2335953c5d27a525179b23001cd8188e40d34539 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 9 Aug 2020 18:02:04 -0400
Subject: [PATCH] gtk-demo: Cosmetic fixes for the fontrendering demo

Make this look a bit less thrown together.
---
 demos/gtk-demo/fontrendering.c  |   2 +-
 demos/gtk-demo/fontrendering.ui | 339 ++++++++++++++++----------------
 2 files changed, 172 insertions(+), 169 deletions(-)

diff --git a/demos/gtk-demo/fontrendering.c b/demos/gtk-demo/fontrendering.c
index d6c3525604..44a628e786 100644
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -19,7 +19,7 @@ static GtkWidget *show_extents = NULL;
 
 static PangoContext *context;
 
-static int scale = 10;
+static int scale = 9;
 
 static void
 update_image (void)
diff --git a/demos/gtk-demo/fontrendering.ui b/demos/gtk-demo/fontrendering.ui
index aa9cec3438..e9fcea53d5 100644
--- a/demos/gtk-demo/fontrendering.ui
+++ b/demos/gtk-demo/fontrendering.ui
@@ -6,164 +6,11 @@
     <property name="page-increment">4</property>
   </object>
   <object class="GtkWindow" id="window">
-    <property name="default-width">600</property>
-    <property name="default-height">300</property>
-    <property name="title">Font rendering</property>
-    <child>
-      <object class="GtkGrid">
-        <property name="margin-top">10</property>
-        <property name="row-spacing">10</property>
-        <property name="column-spacing">10</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="margin-start">10</property>
-            <property name="label">Text</property>
-            <property name="xalign">1</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry">
-            <property name="text">Fonts render</property>
-            <layout>
-              <property name="column">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="margin-start">10</property>
-            <property name="label">Font</property>
-            <property name="xalign">1</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkFontButton" id="font_button">
-            <layout>
-              <property name="column">1</property>
-              <property name="row">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Hinting</property>
-            <property name="xalign">1</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-            <layout>
-              <property name="column">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="hinting">
-            <property name="active">0</property>
-            <property name="valign">center</property>
-            <items>
-              <item translatable="yes" id="none">None</item>
-              <item translatable="yes" id="slight">Slight</item>
-              <item translatable="yes" id="medium">Medium</item>
-              <item translatable="yes" id="full">Full</item>
-            </items>
-            <layout>
-              <property name="column">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="hint_metrics">
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Hint Metrics</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-            <layout>
-              <property name="column">3</property>
-              <property name="row">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="show_extents">
-            <property name="active">1</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Show Extents</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-            <layout>
-              <property name="column">4</property>
-              <property name="row">0</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="show_grid">
-            <property name="active">1</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Show Grid</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-            <layout>
-              <property name="column">4</property>
-              <property name="row">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="up_button">
-            <property name="icon-name">list-add-symbolic</property>
-            <style>
-              <class name="circular"/>
-            </style>
-            <layout>
-              <property name="column">5</property>
-              <property name="row">0</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="down_button">
-            <property name="icon-name">list-remove-symbolic</property>
-            <style>
-              <class name="circular"/>
-            </style>
-            <layout>
-              <property name="column">5</property>
-              <property name="row">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="hexpand">1</property>
-            <layout>
-              <property name="column">6</property>
-            </layout>
-          </object>
-        </child>
-        <child>
+    <property name="default-width">1080</property>
+    <property name="default-height">430</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar">
+        <child type="title">
           <object class="GtkBox">
             <property name="halign">center</property>
             <property name="valign">center</property>
@@ -183,11 +30,172 @@
                 <property name="group">text_radio</property>
               </object>
             </child>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">3</property>
-              <property name="column-span">7</property>
-            </layout>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkGrid">
+            <property name="halign">center</property>
+            <property name="margin-top">10</property>
+            <property name="margin-bottom">10</property>
+            <property name="row-spacing">10</property>
+            <property name="column-spacing">10</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="margin-start">10</property>
+                <property name="label">Text</property>
+                <property name="xalign">1</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+                <layout>
+                  <property name="column">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry">
+                <property name="text">Fonts render</property>
+                <layout>
+                  <property name="column">2</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="margin-start">10</property>
+                <property name="label">Font</property>
+                <property name="xalign">1</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+                <layout>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkFontButton" id="font_button">
+                <layout>
+                  <property name="column">2</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Hinting</property>
+                <property name="xalign">1</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+                <layout>
+                  <property name="column">3</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="hinting">
+                <property name="active">0</property>
+                <property name="valign">center</property>
+                <items>
+                  <item translatable="yes" id="none">None</item>
+                  <item translatable="yes" id="slight">Slight</item>
+                  <item translatable="yes" id="medium">Medium</item>
+                  <item translatable="yes" id="full">Full</item>
+                </items>
+                <layout>
+                  <property name="column">4</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="hint_metrics">
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label">Hint Metrics</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                </child>
+                <layout>
+                  <property name="column">4</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="show_extents">
+                <property name="active">1</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label">Show Extents</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                </child>
+                <layout>
+                  <property name="column">5</property>
+                  <property name="row">0</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="show_grid">
+                <property name="active">1</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label">Show Grid</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                </child>
+                <layout>
+                  <property name="column">5</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="up_button">
+                <property name="icon-name">list-add-symbolic</property>
+                <style>
+                  <class name="circular"/>
+                </style>
+                <layout>
+                  <property name="column">6</property>
+                  <property name="row">0</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="down_button">
+                <property name="icon-name">list-remove-symbolic</property>
+                <style>
+                  <class name="circular"/>
+                </style>
+                <layout>
+                  <property name="column">6</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="hexpand">1</property>
+                <layout>
+                  <property name="column">7</property>
+                </layout>
+              </object>
+            </child>
           </object>
         </child>
         <child>
@@ -203,11 +211,6 @@
                 <property name="can-shrink">0</property>
               </object>
             </child>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">4</property>
-              <property name="column-span">7</property>
-            </layout>
           </object>
         </child>
       </object>