[gnome-control-center] background: Improve layout on the new shell

From: Georges Basile Stavracas Neto <gbsneto src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-control-center] background: Improve layout on the new shell
Date: Sat, 12 Aug 2017 15:37:24 +0000 (UTC)
commit e465010faa62db642bfaac693dbede6ebef891bc
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Sat Aug 12 12:34:01 2017 -0300

    background: Improve layout on the new shell
    
    The current Background panel was designed and architectured
    for a fixed size, non resizable window. As such, it has a
    few quirks that does not scale well with the new shell.
    
    Fix that by rearchitecturing the Background panel hierarchy,
    removing the deprecated widgets and simplifying the overall
    hierarchy of widgets.

 panels/background/background.ui |  175 ++++++++++++++-------------------------
 1 files changed, 61 insertions(+), 114 deletions(-)
---
diff --git a/panels/background/background.ui b/panels/background/background.ui
index 324c99d..e902aa9 100644
--- a/panels/background/background.ui
+++ b/panels/background/background.ui
@@ -1,95 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkHBox" id="background-panel">
+  <object class="GtkBox" id="background-panel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="margin_start">6</property>
-    <property name="margin_end">6</property>
-    <property name="margin_top">6</property>
-    <property name="margin_bottom">6</property>
-    <property name="border_width">10</property>
+    <property name="margin">32</property>
     <property name="spacing">12</property>
+    <property name="valign">center</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_top">100</property>
-        <property name="margin_bottom">100</property>
+        <property name="spacing">24</property>
         <child>
-          <object class="GtkVBox" id="vbox3">
+          <object class="GtkBox" id="vbox3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkAspectFrame" id="aspectframe1">
+              <object class="GtkButton" id="background-set-button">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_end">12</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
                 <child>
-                  <object class="GtkButton" id="background-set-button">
+                  <object class="GtkBox" id="box2">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin">6</property>
+                    <property name="spacing">6</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkDrawingArea" id="background-desktop-drawingarea">
+                        <property name="width_request">310</property>
+                        <property name="height_request">170</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="valign">center</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                      </object>
+                    </child>
                     <child>
-                      <object class="GtkBox" id="box2">
+                      <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkDrawingArea" id="background-desktop-drawingarea">
-                            <property name="width_request">310</property>
-                            <property name="height_request">170</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="margin_start">6</property>
-                            <property name="margin_end">6</property>
-                            <property name="margin_top">6</property>
-                            <property name="margin_bottom">6</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">_Background</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">background-set-button</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="label" translatable="yes">_Background</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">background-set-button</property>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="bottom-hbox">
+              <object class="GtkBox" id="bottom-hbox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">12</property>
                 <child>
-                  <object class="GtkHBox" id="hbox2">
+                  <object class="GtkBox" id="hbox2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">center</property>
@@ -154,79 +125,55 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkBox" id="vbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkAspectFrame" id="aspectframe2">
+              <object class="GtkButton" id="background-lock-set-button">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_start">12</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="halign">start</property>
+                <property name="valign">center</property>
                 <child>
-                  <object class="GtkButton" id="background-lock-set-button">
+                  <object class="GtkBox" id="box3">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin">6</property>
+                    <property name="spacing">6</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkDrawingArea" id="background-lock-drawingarea">
+                        <property name="width_request">310</property>
+                        <property name="height_request">170</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="valign">center</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                      </object>
+                    </child>
                     <child>
-                      <object class="GtkBox" id="box3">
+                      <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkDrawingArea" id="background-lock-drawingarea">
-                            <property name="width_request">310</property>
-                            <property name="height_request">170</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">center</property>
-                            <property name="margin_start">6</property>
-                            <property name="margin_end">6</property>
-                            <property name="margin_top">6</property>
-                            <property name="margin_bottom">6</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" comments="To translators: This is a 
noun, not a verb">_Lock Screen</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">background-lock-set-button</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="label" translatable="yes" comments="To translators: This is a noun, 
not a verb">_Lock Screen</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">background-lock-set-button</property>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="bottom-hbox1">
+              <object class="GtkBox" id="bottom-hbox1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">12</property>
                 <child>
-                  <object class="GtkHBox" id="hbox1">
+                  <object class="GtkBox" id="hbox1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">center</property>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]