diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-08-09 18:02:04 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-08-09 18:02:04 -0400 |
commit | 2335953c5d27a525179b23001cd8188e40d34539 (patch) | |
tree | 7a31419f6dbacb3cede66f2ae2d6f73168ca3cb7 | |
parent | 42902085e59962aafba7554ed43845e771b945de (diff) | |
download | gtk+-2335953c5d27a525179b23001cd8188e40d34539.tar.gz |
gtk-demo: Cosmetic fixes for the fontrendering demo
Make this look a bit less thrown together.
-rw-r--r-- | demos/gtk-demo/fontrendering.c | 2 | ||||
-rw-r--r-- | demos/gtk-demo/fontrendering.ui | 313 |
2 files changed, 159 insertions, 156 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,188 +6,196 @@ <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> + <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> <style> - <class name="dim-label"/> + <class name="linked"/> </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> + <child> + <object class="GtkRadioButton" id="text_radio"> + <property name="draw-indicator">0</property> + <property name="label">Text</property> + </object> + </child> + <child> + <object class="GtkRadioButton" id="grid_radio"> + <property name="draw-indicator">0</property> + <property name="label">Grid</property> + <property name="group">text_radio</property> + </object> + </child> </object> </child> + </object> + </child> + <child> + <object class="GtkBox"> + <property name="orientation">vertical</property> <child> - <object class="GtkCheckButton" id="hint_metrics"> + <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="label">Hint Metrics</property> + <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> - <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> + <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> - <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> + <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> - <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> - <object class="GtkBox"> - <property name="halign">center</property> - <property name="valign">center</property> - <style> - <class name="linked"/> - </style> <child> - <object class="GtkRadioButton" id="text_radio"> - <property name="draw-indicator">0</property> - <property name="label">Text</property> + <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="GtkRadioButton" id="grid_radio"> - <property name="draw-indicator">0</property> - <property name="label">Grid</property> - <property name="group">text_radio</property> + <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> - <layout> - <property name="column">0</property> - <property name="row">3</property> - <property name="column-span">7</property> - </layout> </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> |