[gnome-klotski/arnaudb/wip/gtk4: 10/25] Adapt UI files.




commit b41488f2256d1b92c3c147f7cc0722f2922d9bfe
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Wed May 6 20:21:28 2020 +0200

    Adapt UI files.

 data/ui/help-overlay.ui |  19 +--
 data/ui/klotski.ui      | 369 ++++++++++++++++++++++--------------------------
 2 files changed, 167 insertions(+), 221 deletions(-)
---
diff --git a/data/ui/help-overlay.ui b/data/ui/help-overlay.ui
index 29193ac..36f9823 100644
--- a/data/ui/help-overlay.ui
+++ b/data/ui/help-overlay.ui
@@ -18,15 +18,13 @@
    with this GNOME Klotski.  If not, see <https://www.gnu.org/licenses/>.
 -->
 <interface>
-  <requires lib="gtk+" version="3.24"/>
+  <requires lib="gtk+" version="3.99"/>
   <object class="GtkShortcutsWindow" id="help_overlay">
     <child>
       <object class="GtkShortcutsSection">
-        <property name="visible">True</property>
         <property name="max-height">8</property>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">True</property>
             <!-- Translators: title of a section in the Keyboard Shortcuts dialog; contains "Toggle game 
menu" and "Restart" -->
             <property name="title" translatable="yes" context="shortcut window">Puzzle-related</property>
             <child>
@@ -39,7 +37,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Ctrl-Shift-N shortcut description in the Keyboard Shortcuts dialog, 
section "Puzzle-related"; restarts the current puzzle -->
                 <property name="title" translatable="yes" context="shortcut window">Restart</property>
                 <property name="accelerator">&lt;Primary&gt;&lt;Shift&gt;N</property>
@@ -49,12 +46,10 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">True</property>
             <!-- Translators: title of a section in the Keyboard Shortcuts dialog; contains the actions for 
selecting a new puzzle -->
             <property name="title" translatable="yes" context="shortcut window">Change Puzzle 
popover</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Ctrl-S shortcut description in the Keyboard Shortcuts dialog, section 
"Headerbar"; toggles the Change Puzzle menu -->
                 <property name="title" translatable="yes" context="shortcut window">Select new 
puzzle</property>
                 <property name="accelerator">&lt;Primary&gt;N</property>
@@ -62,7 +57,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Up action description in the Keyboard Shortcuts dialog, section "Change 
Puzzle popover"; switch to previous puzzle -->
                 <property name="title" translatable="yes" context="shortcut window">Previous 
puzzle</property>
                 <property name="accelerator">Up</property>
@@ -70,7 +64,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Down shortcut description in the Keyboard Shortcuts dialog, section 
"Change Puzzle popover"; switch to next puzzle -->
                 <property name="title" translatable="yes" context="shortcut window">Next puzzle</property>
                 <property name="accelerator">Down</property>
@@ -78,7 +71,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Page_Up action description in the Keyboard Shortcuts dialog, section 
"Change Puzzle popover"; switch to previous puzzles group -->
                 <property name="title" translatable="yes" context="shortcut window">Previous puzzles 
group</property>
                 <property name="accelerator">Page_Up</property>
@@ -86,7 +78,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Page_Down shortcut description in the Keyboard Shortcuts dialog, section 
"Change Puzzle popover"; switch to next puzzles group -->
                 <property name="title" translatable="yes" context="shortcut window">Next puzzles 
group</property>
                 <property name="accelerator">Page_Down</property>
@@ -96,12 +87,10 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">True</property>
             <!-- Translators: title of a section in the Keyboard Shortcuts dialog; contains (only) "Scores 
dialog" -->
             <property name="title" translatable="yes" context="shortcut window">Scores</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Ctrl-S shortcut description in the Keyboard Shortcuts dialog, section 
"Scores" -->
                 <property name="title" translatable="yes" context="shortcut window">Scores dialog</property>
                 <property name="accelerator">&lt;Primary&gt;S</property>
@@ -111,12 +100,10 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">True</property>
             <!-- Translators: title of a section in the Keyboard Shortcuts dialog; contains "Help", "About", 
"Quit"... -->
             <property name="title" translatable="yes" context="shortcut window">Generic</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: F10 shortcut description in the Keyboard Shortcuts dialog, section 
"Generic": toggles the hamburger menu -->
                 <property name="title" translatable="yes" context="shortcut window">Toggle main 
menu</property>
                 <property name="accelerator">F10</property>
@@ -124,7 +111,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Ctrl-? shortcut description in the Keyboard Shortcuts dialog, section 
"Generic": opens Shortcuts dialog -->
                 <property name="title" translatable="yes" context="shortcut window">Keyboard 
shortcuts</property>
                 <property name="accelerator">&lt;Primary&gt;question &lt;Primary&gt;F1</property>
@@ -132,7 +118,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: F1 shortcut description in the Keyboard Shortcuts dialog, section 
"Generic": opens the application help -->
                 <property name="title" translatable="yes" context="shortcut window">Help</property>
                 <property name="accelerator">F1</property>
@@ -140,7 +125,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Shift-F1 shortcut description in the Keyboard Shortcuts dialog, section 
"Generic": shows the About dialog -->
                 <property name="title" translatable="yes" context="shortcut window">About</property>
                 <property name="accelerator">&lt;Shift&gt;F1</property>
@@ -148,7 +132,6 @@
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">True</property>
                 <!-- Translators: Ctrl-Q shortcut description in the Keyboard Shortcuts dialog, section 
"Generic": quits the application -->
                 <property name="title" translatable="yes" context="shortcut window">Quit</property>
                 <property name="accelerator">&lt;Primary&gt;q</property>
diff --git a/data/ui/klotski.ui b/data/ui/klotski.ui
index 6962071..91b34af 100644
--- a/data/ui/klotski.ui
+++ b/data/ui/klotski.ui
@@ -16,7 +16,7 @@
    with GNOME Klotski.  If not, see <https://www.gnu.org/licenses/>.
 -->
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk+" version="3.99"/>
   <menu id="main-menu">
     <section>
       <item>
@@ -55,269 +55,254 @@
     </section>
   </menu>
   <object class="GtkPopover" id="puzzles_popover">
-    <property name="visible">False</property>
     <property name="name">puzzles-popover</property>
     <child>
       <object class="GtkBox">
-        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkBox">
-            <property name="visible">True</property>
             <property name="orientation">horizontal</property>
             <property name="halign">fill</property>
             <property name="spacing">9</property>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="action-name">win.prev-pack</property>
-                <style><class name="flat"/><class name="image-button"/></style>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon-name">go-previous-symbolic</property>
-                    <property name="visible">True</property>
-                    <property name="icon-size">1</property>
-                  </object>
-                </child>
+                <property name="icon-name">go-previous-symbolic</property>
+                <style>
+                  <class name="flat"/>
+                  <class name="image-button"/>
+                </style>
               </object>
             </child>
             <child>
               <object class="GtkStack" id="stack_packs">
                 <property name="name">stack-packs</property>
-                <property name="visible">True</property>
                 <child>
-                  <object class="GtkLabel">
-                    <property name="name">pack-name</property>
-                    <property name="visible">True</property>
-                    <!-- Translators: name of a levels pack, as seen in the Change Puzzle popover; contains 
classical levels -->
-                    <property name="label" translatable="yes">Huarong Trail</property>
-                  </object>
-                  <packing>
+                  <object class="GtkStackPage">
                     <property name="name">huarong</property>
-                    <property name="position">0</property>
-                  </packing>
+                    <property name="child">
+                      <object class="GtkLabel">
+                        <property name="name">pack-name</property>
+                        <!-- Translators: name of a levels pack, as seen in the Change Puzzle popover; 
contains classical levels -->
+                        <property name="label" translatable="yes">Huarong Trail</property>
+                      </object>
+                    </property>
+                  </object>
                 </child>
                 <child>
-                  <object class="GtkLabel">
-                    <property name="name">pack-name</property>
-                    <property name="visible">True</property>
-                    <!-- Translators: name of a levels pack, as seen in the Change Puzzle popover; contains 
medium-difficulty levels -->
-                    <property name="label" translatable="yes">Challenge Pack</property>
-                  </object>
-                  <packing>
+                  <object class="GtkStackPage">
                     <property name="name">challenge</property>
-                    <property name="position">1</property>
-                  </packing>
+                    <property name="child">
+                      <object class="GtkLabel">
+                        <property name="name">pack-name</property>
+                        <!-- Translators: name of a levels pack, as seen in the Change Puzzle popover; 
contains medium-difficulty levels -->
+                        <property name="label" translatable="yes">Challenge Pack</property>
+                      </object>
+                    </property>
+                  </object>
                 </child>
                 <child>
-                  <object class="GtkLabel">
-                    <property name="name">pack-name</property>
-                    <property name="visible">True</property>
-                    <!-- Translators: name of a levels pack, as seen in the Change Puzzle popover; contains 
hardest levels -->
-                    <property name="label" translatable="yes">Skill Pack</property>
-                  </object>
-                  <packing>
+                  <object class="GtkStackPage">
                     <property name="name">skill</property>
-                    <property name="position">2</property>
-                  </packing>
+                    <property name="child">
+                      <object class="GtkLabel">
+                        <property name="name">pack-name</property>
+                        <!-- Translators: name of a levels pack, as seen in the Change Puzzle popover; 
contains hardest levels -->
+                        <property name="label" translatable="yes">Skill Pack</property>
+                      </object>
+                    </property>
+                  </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">True</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <property name="action-name">win.next-pack</property>
-                <style><class name="flat"/><class name="image-button"/></style>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon-name">go-next-symbolic</property>
-                    <property name="visible">True</property>
-                    <property name="icon-size">1</property>
-                  </object>
-                </child>
+                <property name="icon-name">go-next-symbolic</property>
+                <style>
+                  <class name="flat"/>
+                  <class name="image-button"/>
+                </style>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkStack" id="stack_puzzles"> <!-- GtkScrolledWindow children are here for when big 
text -->
-            <property name="visible">True</property>
-            <property name="homogeneous">True</property>
+            <property name="hhomogeneous">True</property>
+            <property name="vhomogeneous">True</property>
             <property name="height-request">270</property>
             <property name="width-request">190</property>
             <child>
-              <object class="GtkScrolledWindow">
-                <property name="visible">True</property>
-                <property name="hscrollbar-policy">never</property>
-                <style><class name="treeview-container"/></style>
-                <child>
-                  <object class="GtkTreeView" id="treeview_huarong">
-                    <property name="visible">True</property>
-                    <property name="headers-visible">False</property>
-                    <property name="activate-on-single-click">True</property>
-                    <property name="can-focus">False</property> <!-- for up/down keybinding -->
-                    <!-- <property name="model">*store</property> TODO -->
-                    <style><class name="toggle-like-pixbuf"/></style>
+              <object class="GtkStackPage">
+                <property name="name">huarong</property>
+                <property name="child">
+                  <object class="GtkScrolledWindow">
+                    <property name="hscrollbar-policy">never</property>
+                    <style>
+                      <class name="treeview-container"/>
+                    </style>
                     <child>
-                      <object class="GtkTreeViewColumn">
-                        <property name="title">Puzzle</property>
-                        <property name="expand">True</property>
+                      <object class="GtkTreeView" id="treeview_huarong">
+                        <property name="headers-visible">False</property>
+                        <property name="activate-on-single-click">True</property>
+                        <property name="can-focus">False</property> <!-- for up/down keybinding -->
+                        <!-- <property name="model">*store</property> TODO -->
+                        <style>
+                          <class name="toggle-like-pixbuf"/>
+                        </style>
                         <child>
-                          <object class="GtkCellRendererText"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
+                          <object class="GtkTreeViewColumn">
+                            <property name="title">Puzzle</property>
+                            <property name="expand">True</property>
+                            <child>
+                              <object class="GtkCellRendererText"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                         </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn">
-                        <property name="title">Complete</property>
                         <child>
-                          <object class="GtkCellRendererToggle"/>
-                          <attributes>
-                            <attribute name="active">1</attribute>
-                            <attribute name="sensitive">3</attribute>
-                          </attributes>
+                          <object class="GtkTreeViewColumn">
+                            <property name="title">Complete</property>
+                            <child>
+                              <object class="GtkCellRendererToggle"/>
+                              <attributes>
+                                <attribute name="active">1</attribute>
+                                <attribute name="sensitive">3</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                         </child>
                       </object>
                     </child>
                   </object>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="name">huarong</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow">
-                <property name="visible">True</property>
-                <property name="hscrollbar-policy">never</property>
-                <style><class name="treeview-container"/></style>
-                <child>
-                  <object class="GtkTreeView" id="treeview_challenge">
-                    <property name="visible">True</property>
-                    <property name="headers-visible">False</property>
-                    <property name="activate-on-single-click">True</property>
-                    <property name="can-focus">False</property> <!-- for up/down keybinding -->
-                    <!-- <property name="model">*store</property> TODO -->
-                    <style><class name="toggle-like-pixbuf"/></style>
+              <object class="GtkStackPage">
+                <property name="name">challenge</property>
+                <property name="child">
+                  <object class="GtkScrolledWindow">
+                    <property name="hscrollbar-policy">never</property>
+                    <style>
+                      <class name="treeview-container"/>
+                    </style>
                     <child>
-                      <object class="GtkTreeViewColumn">
-                        <property name="title">Puzzle</property>
-                        <property name="expand">True</property>
+                      <object class="GtkTreeView" id="treeview_challenge">
+                        <property name="headers-visible">False</property>
+                        <property name="activate-on-single-click">True</property>
+                        <property name="can-focus">False</property> <!-- for up/down keybinding -->
+                        <!-- <property name="model">*store</property> TODO -->
+                        <style>
+                          <class name="toggle-like-pixbuf"/>
+                        </style>
                         <child>
-                          <object class="GtkCellRendererText"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
+                          <object class="GtkTreeViewColumn">
+                            <property name="title">Puzzle</property>
+                            <property name="expand">True</property>
+                            <child>
+                              <object class="GtkCellRendererText"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                         </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn">
-                        <property name="title">Complete</property>
                         <child>
-                          <object class="GtkCellRendererToggle"/>
-                          <attributes>
-                            <attribute name="active">1</attribute>
-                            <attribute name="sensitive">3</attribute>
-                          </attributes>
+                          <object class="GtkTreeViewColumn">
+                            <property name="title">Complete</property>
+                            <child>
+                              <object class="GtkCellRendererToggle"/>
+                              <attributes>
+                                <attribute name="active">1</attribute>
+                                <attribute name="sensitive">3</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                         </child>
                       </object>
                     </child>
                   </object>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="name">challenge</property>
-                <property name="position">1</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkScrolledWindow">
-                <property name="visible">True</property>
-                <property name="hscrollbar-policy">never</property>
-                <style><class name="treeview-container"/></style>
-                <child>
-                  <object class="GtkTreeView" id="treeview_skill">
-                    <property name="visible">True</property>
-                    <property name="headers-visible">False</property>
-                    <property name="activate-on-single-click">True</property>
-                    <property name="can-focus">False</property> <!-- for up/down keybinding -->
-                    <!-- <property name="model">*store</property> TODO -->
-                    <style><class name="toggle-like-pixbuf"/></style>
+              <object class="GtkStackPage">
+                <property name="name">skill</property>
+                <property name="child">
+                  <object class="GtkScrolledWindow">
+                    <property name="hscrollbar-policy">never</property>
+                    <style>
+                      <class name="treeview-container"/>
+                    </style>
                     <child>
-                      <object class="GtkTreeViewColumn">
-                        <property name="title">Puzzle</property>
-                        <property name="expand">True</property>
+                      <object class="GtkTreeView" id="treeview_skill">
+                        <property name="headers-visible">False</property>
+                        <property name="activate-on-single-click">True</property>
+                        <property name="can-focus">False</property> <!-- for up/down keybinding -->
+                        <!-- <property name="model">*store</property> TODO -->
+                        <style>
+                          <class name="toggle-like-pixbuf"/>
+                        </style>
                         <child>
-                          <object class="GtkCellRendererText"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
+                          <object class="GtkTreeViewColumn">
+                            <property name="title">Puzzle</property>
+                            <property name="expand">True</property>
+                            <child>
+                              <object class="GtkCellRendererText"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                         </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn">
-                        <property name="title">Complete</property>
                         <child>
-                          <object class="GtkCellRendererToggle"/>
-                          <attributes>
-                            <attribute name="active">1</attribute>
-                            <attribute name="sensitive">3</attribute>
-                          </attributes>
+                          <object class="GtkTreeViewColumn">
+                            <property name="title">Complete</property>
+                            <child>
+                              <object class="GtkCellRendererToggle"/>
+                              <attributes>
+                                <attribute name="active">1</attribute>
+                                <attribute name="sensitive">3</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                         </child>
                       </object>
                     </child>
                   </object>
-                </child>
+                </property>
               </object>
-              <packing>
-                <property name="name">skill</property>
-                <property name="position">2</property>
-              </packing>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox">
             <property name="orientation">horizontal</property>
-            <property name="visible">True</property>
             <property name="homogeneous">True</property>
             <property name="halign">fill</property>
-            <style><class name="linked"/></style>
+            <style>
+              <class name="linked"/>
+            </style>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <!-- Translators: in the Change Puzzle popover, label of the button for playing the previous 
level -->
                 <property name="label" translatable="yes">Previous</property>
                 <!-- <property name="use-underline">True</property> TODO -->
                 <property name="action-name">win.prev-puzzle</property>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButton">
-                <property name="visible">True</property>
                 <!-- Translators: in the Change Puzzle popover, label of the button for playing the next 
level -->
                 <property name="label" translatable="yes">Next</property>
                 <!-- <property name="use-underline">True</property> TODO -->
                 <property name="action-name">win.next-puzzle</property>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-              </packing>
             </child>
           </object>
         </child>
@@ -329,17 +314,15 @@
     <!-- <initial-focus name=""/> -->
     <property name="width-request">600</property>
     <property name="height-request">400</property>
-    <signal name="size_allocate" handler="on_size_allocate"/>
+    <signal name="size-allocate" handler="on_size_allocate"/>
     <signal name="map" handler="init_state_watcher"/>
     <signal name="destroy" handler="on_destroy"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
-        <property name="visible">True</property>
-        <property name="show-close-button">True</property>
+        <property name="show-title-buttons">True</property>
         <property name="title" translatable="yes">Klotski</property>
-        <child>
+        <child type="start">
           <object class="GtkMenuButton">
-            <property name="visible">True</property>
             <property name="valign">center</property>
             <property name="use-underline">True</property>
             <!-- Translators: in the headerbar, button that allows via a popover to select a different 
puzzle (with a mnemonic that appears pressing Alt) -->
@@ -353,9 +336,8 @@
             <property name="popover">puzzles_popover</property>
           </object>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkMenuButton" id="game_menubutton">
-            <property name="visible">True</property>
             <property name="valign">center</property>
             <property name="label">0</property>
             <property name="can-focus">True</property>
@@ -364,39 +346,26 @@
             <property name="tooltip-text" translatable="yes">Moves counter</property>
             <property name="menu-model">game-menu</property>
           </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
         </child>
-        <child>
+        <child type="end">
           <object class="GtkMenuButton" id="main_menubutton">
-            <property name="visible">True</property>
             <property name="valign">center</property>
-            <property name="can_focus">True</property>
+            <property name="can-focus">True</property>
             <property name="menu-model">main-menu</property>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="icon_name">open-menu-symbolic</property>
-                <property name="icon_size">1</property>
-              </object>
-            </child>
+            <property name="icon-name">open-menu-symbolic</property>
           </object>
-          <packing>
-            <property name="pack_type">end</property>
-            <property name="position">1</property>
-          </packing>
         </child>
       </object>
     </child>
     <child>
       <object class="GtkOverlay" id="main_overlay">
-        <property name="visible">True</property>
         <child>
           <object class="GtkGrid" id="main_grid">
-            <property name="visible">True</property>
             <property name="orientation">vertical</property>
-            <property name="margin">25</property> <!-- TODO use CSS -->
+            <property name="margin-start">25</property>     <!-- TODO use CSS -->
+            <property name="margin-end">25</property>       <!-- TODO use CSS -->
+            <property name="margin-top">25</property>       <!-- TODO use CSS -->
+            <property name="margin-bottom">25</property>    <!-- TODO use CSS -->
           </object>
         </child>
         <child type="overlay">
@@ -405,18 +374,12 @@
             <property name="halign">end</property>
             <property name="valign">start</property>
             <property name="action-name">win.unfullscreen</property>
+            <property name="icon-name">view-restore-symbolic</property>
             <style>
               <class name="image-button"/>
               <class name="unfullscreen-button"/>
               <class name="flat"/>
             </style>
-            <child>
-              <object class="GtkImage">
-                <property name="icon-name">view-restore-symbolic</property>
-                <property name="visible">True</property>
-                <property name="icon-size">1</property>
-              </object>
-            </child>
           </object>
         </child>
       </object>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]