GNOME.org
 

[gnome-control-center] shell: Fittsify panels

commit 3d27d8caafbcd3235adc8f1b3acd2195f178a177
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jan 5 19:13:25 2013 -0500

    shell: Fittsify panels
    
    Make it possible for panels to go all the way to the edge of the
    shell. This is particularly important for panels that scroll, such
    as the new power panel. All other panels are changed to compensate
    for the loss of external padding.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=691229

 panels/background/background.ui                   |    4 ++++
 panels/bluetooth/bluetooth.ui                     |    4 ++++
 panels/color/color.ui                             |    4 ++++
 panels/datetime/datetime.ui                       |    8 ++++----
 panels/display/display-capplet.ui                 |    4 ++++
 panels/info/info.ui                               |    4 ++++
 panels/keyboard/gnome-keyboard-panel.ui           |    4 ++++
 panels/mouse/cc-mouse-panel.c                     |    4 ++++
 panels/network/network.ui                         |    4 ++++
 panels/notifications/notifications.ui             |    8 ++++----
 panels/online-accounts/online-accounts.ui         |    4 ++++
 panels/printers/printers.ui                       |    4 ++++
 panels/privacy/privacy.ui                         |    8 ++++----
 panels/region/gnome-region-panel.ui               |    2 +-
 panels/screen/screen.ui                           |    4 ++++
 panels/search/search.ui                           |    8 ++++----
 panels/sound/gvc-mixer-dialog.c                   |    2 +-
 panels/universal-access/uap.ui                    |    1 +
 panels/user-accounts/data/user-accounts-dialog.ui |    4 ++++
 panels/wacom/cc-wacom-panel.c                     |    8 ++++----
 shell/gnome-control-center.c                      |    1 -
 21 files changed, 71 insertions(+), 23 deletions(-)
---
diff --git a/panels/background/background.ui b/panels/background/background.ui
index e6e2e5a..651cf69 100644
--- a/panels/background/background.ui
+++ b/panels/background/background.ui
@@ -6,6 +6,10 @@
     <property name="can_focus">False</property>
     <property name="border_width">10</property>
     <property name="spacing">12</property>
+    <property name="margin-left">6</property>
+    <property name="margin-right">6</property>
+    <property name="margin-top">6</property>
+    <property name="margin-bottom">6</property>
     <child>
       <object class="GtkVBox" id="vbox3">
         <property name="visible">True</property>
diff --git a/panels/bluetooth/bluetooth.ui b/panels/bluetooth/bluetooth.ui
index 00842b7..eefb607 100644
--- a/panels/bluetooth/bluetooth.ui
+++ b/panels/bluetooth/bluetooth.ui
@@ -46,6 +46,10 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">8</property>
+        <property name="margin-left">6</property>
+        <property name="margin-right">6</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
         <child>
           <placeholder/>
         </child>
diff --git a/panels/color/color.ui b/panels/color/color.ui
index 0592ef4..5b51e70 100644
--- a/panels/color/color.ui
+++ b/panels/color/color.ui
@@ -14,6 +14,10 @@
         <property name="border_width">15</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
+        <property name="margin-left">6</property>
+        <property name="margin-right">6</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
         <child>
           <object class="GtkHBox" id="hbox3">
             <property name="visible">True</property>
diff --git a/panels/datetime/datetime.ui b/panels/datetime/datetime.ui
index caec8e8..bdfebca 100644
--- a/panels/datetime/datetime.ui
+++ b/panels/datetime/datetime.ui
@@ -6,10 +6,10 @@
     <child>
       <object class="GtkAlignment" id="datetime-panel">
         <property name="visible">True</property>
-        <property name="top_padding">10</property>
-        <property name="left_padding">10</property>
-        <property name="bottom_padding">10</property>
-        <property name="right_padding">10</property>
+        <property name="top_padding">16</property>
+        <property name="left_padding">16</property>
+        <property name="bottom_padding">16</property>
+        <property name="right_padding">16</property>
         <child>
           <object class="GtkVBox" id="hbox">
             <property name="visible">True</property>
diff --git a/panels/display/display-capplet.ui b/panels/display/display-capplet.ui
index fea8dad..6906e5d 100644
--- a/panels/display/display-capplet.ui
+++ b/panels/display/display-capplet.ui
@@ -9,6 +9,10 @@
         <property name="border_width">10</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
+        <property name="margin-left">6</property>
+        <property name="margin-right">6</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
         <child>
           <object class="GtkAlignment" id="align">
             <property name="visible">True</property>
diff --git a/panels/info/info.ui b/panels/info/info.ui
index f451d13..0064a16 100644
--- a/panels/info/info.ui
+++ b/panels/info/info.ui
@@ -183,6 +183,10 @@
         <property name="can_focus">False</property>
         <property name="border_width">10</property>
         <property name="orientation">vertical</property>
+        <property name="margin-left">6</property>
+        <property name="margin-right">6</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
         <child>
           <object class="GtkBox" id="hbox1">
             <property name="visible">True</property>
diff --git a/panels/keyboard/gnome-keyboard-panel.ui b/panels/keyboard/gnome-keyboard-panel.ui
index ed2926a..70e580c 100644
--- a/panels/keyboard/gnome-keyboard-panel.ui
+++ b/panels/keyboard/gnome-keyboard-panel.ui
@@ -221,6 +221,10 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="border_width">10</property>
+            <property name="margin-left">6</property>
+            <property name="margin-right">6</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">6</property>
             <child>
               <object class="GtkVBox" id="general_page">
                 <property name="visible">True</property>
diff --git a/panels/mouse/cc-mouse-panel.c b/panels/mouse/cc-mouse-panel.c
index 23ef418..5d8465e 100644
--- a/panels/mouse/cc-mouse-panel.c
+++ b/panels/mouse/cc-mouse-panel.c
@@ -167,6 +167,10 @@ cc_mouse_panel_init (CcMousePanel *self)
   priv->test_widget = gnome_mouse_test_init (priv->builder);
 
   priv->widget = gtk_notebook_new ();
+  gtk_widget_set_margin_left (priv->widget, 6);
+  gtk_widget_set_margin_right (priv->widget, 6);
+  gtk_widget_set_margin_top (priv->widget, 6);
+  gtk_widget_set_margin_bottom (priv->widget, 6);
   gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->widget), FALSE);
   gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->widget), FALSE);
 
diff --git a/panels/network/network.ui b/panels/network/network.ui
index dd2dc15..3e04b6d 100644
--- a/panels/network/network.ui
+++ b/panels/network/network.ui
@@ -224,6 +224,10 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="spacing">12</property>
+        <property name="margin-left">6</property>
+        <property name="margin-right">6</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
         <child>
           <object class="GtkVBox" id="vbox2">
             <property name="visible">True</property>
diff --git a/panels/notifications/notifications.ui b/panels/notifications/notifications.ui
index 46d5d5d..a002f2d 100644
--- a/panels/notifications/notifications.ui
+++ b/panels/notifications/notifications.ui
@@ -6,10 +6,10 @@
       <object class="GtkGrid" id="ccnotify-main-grid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">12</property>
-        <property name="margin_right">12</property>
-        <property name="margin_top">12</property>
-        <property name="margin_bottom">12</property>
+        <property name="margin_left">18</property>
+        <property name="margin_right">18</property>
+        <property name="margin_top">18</property>
+        <property name="margin_bottom">18</property>
         <property name="orientation">vertical</property>
         <property name="row_spacing">10</property>
         <child>
diff --git a/panels/online-accounts/online-accounts.ui b/panels/online-accounts/online-accounts.ui
index ec1815b..9b92d85 100644
--- a/panels/online-accounts/online-accounts.ui
+++ b/panels/online-accounts/online-accounts.ui
@@ -10,6 +10,10 @@
         <property name="spacing">6</property>
         <property name="border-width">8</property>
         <property name="orientation">horizontal</property>
+        <property name="margin-left">6</property>
+        <property name="margin-right">6</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
         <child>
           <object class="GtkBox" id="accounts-tree-box">
             <property name="visible">True</property>
diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui
index 2e732c9..f36e948 100644
--- a/panels/printers/printers.ui
+++ b/panels/printers/printers.ui
@@ -6,6 +6,10 @@
     <property name="border_width">10</property>
     <property name="orientation">vertical</property>
     <property name="spacing">10</property>
+    <property name="margin-left">6</property>
+    <property name="margin-right">6</property>
+    <property name="margin-top">6</property>
+    <property name="margin-bottom">6</property>
     <child>
       <object class="GtkHBox" id="hbox1">
         <property name="visible">True</property>
diff --git a/panels/privacy/privacy.ui b/panels/privacy/privacy.ui
index adf4e1a..555328a 100644
--- a/panels/privacy/privacy.ui
+++ b/panels/privacy/privacy.ui
@@ -845,10 +845,10 @@
       <object class="GtkBox" id="privacy_vbox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_left">128</property>
-        <property name="margin_right">128</property>
-        <property name="margin_top">16</property>
-        <property name="margin_bottom">16</property>
+        <property name="margin_left">134</property>
+        <property name="margin_right">134</property>
+        <property name="margin_top">22</property>
+        <property name="margin_bottom">22</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolled_window">
diff --git a/panels/region/gnome-region-panel.ui b/panels/region/gnome-region-panel.ui
index 7eff8b1..4a6e43d 100644
--- a/panels/region/gnome-region-panel.ui
+++ b/panels/region/gnome-region-panel.ui
@@ -104,7 +104,7 @@
               <object class="GtkNotebook" id="region_notebook">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="border_width">10</property>
+                <property name="border_width">16</property>
                 <child>
                   <object class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
diff --git a/panels/screen/screen.ui b/panels/screen/screen.ui
index 2a57574..495304d 100644
--- a/panels/screen/screen.ui
+++ b/panels/screen/screen.ui
@@ -90,6 +90,10 @@
       <object class="GtkVBox" id="screen_vbox">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
+        <property name="margin-left">6</property>
+        <property name="margin-right">6</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
         <child>
           <object class="GtkVBox" id="vbox9">
             <property name="visible">True</property>
diff --git a/panels/search/search.ui b/panels/search/search.ui
index 02b8326..cc1d78e 100644
--- a/panels/search/search.ui
+++ b/panels/search/search.ui
@@ -6,10 +6,10 @@
       <object class="GtkBox" id="search_vbox">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
-        <property name="margin-left">128</property>
-        <property name="margin-right">128</property>
-        <property name="margin-top">16</property>
-        <property name="margin-bottom">16</property>
+        <property name="margin-left">134</property>
+        <property name="margin-right">134</property>
+        <property name="margin-top">22</property>
+        <property name="margin-bottom">22</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolled_window">
             <property name="visible">True</property>
diff --git a/panels/sound/gvc-mixer-dialog.c b/panels/sound/gvc-mixer-dialog.c
index 6a7afb5..92ec38b 100644
--- a/panels/sound/gvc-mixer-dialog.c
+++ b/panels/sound/gvc-mixer-dialog.c
@@ -1633,7 +1633,7 @@ gvc_mixer_dialog_constructor (GType                  type,
         main_vbox = GTK_WIDGET (self);
         gtk_box_set_spacing (GTK_BOX (main_vbox), 2);
 
-        gtk_container_set_border_width (GTK_CONTAINER (self), 6);
+        gtk_container_set_border_width (GTK_CONTAINER (self), 12);
 
         self->priv->output_stream_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
         alignment = gtk_alignment_new (0, 0, 1, 1);
diff --git a/panels/universal-access/uap.ui b/panels/universal-access/uap.ui
index 9f2c643..24b88c1 100644
--- a/panels/universal-access/uap.ui
+++ b/panels/universal-access/uap.ui
@@ -148,6 +148,7 @@
           <object class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="border-width">16</property>
             <child>
               <object class="GtkVBox" id="seeing_vbox">
                 <property name="visible">True</property>
diff --git a/panels/user-accounts/data/user-accounts-dialog.ui b/panels/user-accounts/data/user-accounts-dialog.ui
index d6e101b..cbc798b 100644
--- a/panels/user-accounts/data/user-accounts-dialog.ui
+++ b/panels/user-accounts/data/user-accounts-dialog.ui
@@ -42,6 +42,10 @@
       <object class="GtkVBox" id="user-account-main-vbox">
         <property name="visible">True</property>
         <property name="spacing">6</property>
+        <property name="margin-left">6</property>
+        <property name="margin-right">6</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
         <child>
           <object class="GtkVBox" id="accounts-vbox">
             <property name="visible">True</property>
diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c
index f52da16..1cf6b4e 100644
--- a/panels/wacom/cc-wacom-panel.c
+++ b/panels/wacom/cc-wacom-panel.c
@@ -357,10 +357,10 @@ cc_wacom_panel_init (CcWacomPanel *self)
 	gtk_widget_set_vexpand (GTK_WIDGET (notebook), TRUE);
 	gtk_container_set_border_width (GTK_CONTAINER (notebook), 0);
 	g_object_set (G_OBJECT (notebook),
-		      "margin-top", 0,
-		      "margin-right", 24,
-		      "margin-left", 24,
-		      "margin-bottom", 24,
+		      "margin-top", 6,
+		      "margin-right", 30,
+		      "margin-left", 30,
+		      "margin-bottom", 30,
 		      NULL);
 
 	gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (notebook));
diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
index af0e4e1..d3a415a 100644
--- a/shell/gnome-control-center.c
+++ b/shell/gnome-control-center.c
@@ -195,7 +195,6 @@ activate_panel (GnomeControlCenter *shell,
                                   cc_panel_get_permission (CC_PANEL (priv->current_panel)));
 
   box = gtk_alignment_new (0, 0, 1, 1);
-  gtk_alignment_set_padding (GTK_ALIGNMENT (box), 6, 6, 6, 6);
 
   gtk_container_add (GTK_CONTAINER (box), priv->current_panel);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]