Commit 87568e92 authored by Allan Day's avatar Allan Day Committed by Rui Matos
Browse files

Harmonize list box row layouts

While it isn't possible, or even advisable, to make all the list
box rows the same height, using a number of standard heights will
make the control center feel more harmoneous.

Adust the height of the list box rows in Color, Date & Time,
Mouse & Touchpad, Network, Privacy, Region & Language, Sharing
and Universal Access. Makes standard rows that contain labels
and/or controls 58px tall. Some other rows, such as those which
contain two lines of text, are allowed to be taller.

https://bugzilla.gnome.org/show_bug.cgi?id=786384
parent 8a8e53ab
......@@ -292,9 +292,9 @@ cc_color_device_init (CcColorDevice *color_device)
/* description */
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 9);
priv->widget_description = gtk_label_new ("");
gtk_widget_set_margin_start (priv->widget_description, 12);
gtk_widget_set_margin_top (priv->widget_description, 6);
gtk_widget_set_margin_bottom (priv->widget_description, 6);
gtk_widget_set_margin_start (priv->widget_description, 20);
gtk_widget_set_margin_top (priv->widget_description, 12);
gtk_widget_set_margin_bottom (priv->widget_description, 12);
gtk_widget_set_halign (priv->widget_description, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (box), priv->widget_description, TRUE, TRUE, 0);
......@@ -314,9 +314,9 @@ cc_color_device_init (CcColorDevice *color_device)
gtk_button_set_relief (GTK_BUTTON (priv->widget_button), GTK_RELIEF_NONE);
gtk_container_add (GTK_CONTAINER (priv->widget_button), priv->widget_arrow);
gtk_widget_set_visible (priv->widget_arrow, TRUE);
gtk_widget_set_margin_top (priv->widget_button, 3);
gtk_widget_set_margin_bottom (priv->widget_button, 3);
gtk_widget_set_margin_end (priv->widget_button, 9);
gtk_widget_set_margin_top (priv->widget_button, 9);
gtk_widget_set_margin_bottom (priv->widget_button, 9);
gtk_widget_set_margin_end (priv->widget_button, 12);
gtk_box_pack_start (GTK_BOX (box), priv->widget_button, FALSE, FALSE, 0);
/* not calibrated */
......
......@@ -292,8 +292,9 @@
<property name="can_focus">False</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="spacing">2</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="network_time_label">
......@@ -319,6 +320,9 @@
<style>
<class name="dim-label"/>
</style>
<attributes>
<attribute name="scale" value="0.88"/>
</attributes>
</object>
<packing>
<property name="expand">True</property>
......@@ -366,8 +370,9 @@
<property name="can_focus">False</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="spacing">2</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="auto_timezone_label">
......@@ -393,6 +398,9 @@
<style>
<class name="dim-label"/>
</style>
<attributes>
<attribute name="scale" value="0.88"/>
</attributes>
</object>
<packing>
<property name="expand">True</property>
......
......@@ -68,12 +68,12 @@
<object class="GtkGrid" id="primary-button-grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">0</property>
<property name="row_spacing">2</property>
<property name="column_spacing">16</property>
<property name="margin_start">12</property>
<property name="margin_end">6</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<child>
<object class="GtkLabel" id="primary-button-label">
<property name="visible">True</property>
......@@ -202,8 +202,8 @@
<property name="can_focus">False</property>
<property name="row_spacing">0</property>
<property name="column_spacing">32</property>
<property name="margin_start">12</property>
<property name="margin_end">6</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">8</property>
<property name="margin_bottom">8</property>
<property name="valign">center</property>
......@@ -259,10 +259,10 @@
<object class="GtkGrid" id="mouse-natural-scrolling-grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">0</property>
<property name="row_spacing">2</property>
<property name="column_spacing">16</property>
<property name="margin_start">12</property>
<property name="margin_end">6</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="valign">center</property>
......@@ -371,10 +371,10 @@
<property name="can_focus">False</property>
<property name="row_spacing">0</property>
<property name="column_spacing">32</property>
<property name="margin_start">12</property>
<property name="margin_end">6</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="valign">center</property>
<child>
<object class="GtkLabel" id="touchpad-toggle-label">
......@@ -435,10 +435,10 @@
<object class="GtkGrid" id="touchpad-natural-scrolling-grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">0</property>
<property name="row_spacing">2</property>
<property name="column_spacing">16</property>
<property name="margin_start">12</property>
<property name="margin_end">6</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="valign">center</property>
......@@ -508,8 +508,8 @@
<property name="can_focus">False</property>
<property name="row_spacing">0</property>
<property name="column_spacing">16</property>
<property name="margin_start">12</property>
<property name="margin_end">6</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">8</property>
<property name="margin_bottom">8</property>
<property name="valign">center</property>
......@@ -566,10 +566,10 @@
<property name="can_focus">False</property>
<property name="row_spacing">0</property>
<property name="column_spacing">32</property>
<property name="margin_start">12</property>
<property name="margin_end">6</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="valign">center</property>
<child>
<object class="GtkLabel" id="tap-to-click-label">
......@@ -619,10 +619,10 @@
<property name="can_focus">False</property>
<property name="row_spacing">0</property>
<property name="column_spacing">32</property>
<property name="margin_start">12</property>
<property name="margin_end">6</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="valign">center</property>
<child>
<object class="GtkLabel" id="two-finger-scrolling-label">
......@@ -672,10 +672,10 @@
<property name="can_focus">False</property>
<property name="row_spacing">0</property>
<property name="column_spacing">32</property>
<property name="margin_start">12</property>
<property name="margin_end">6</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="valign">center</property>
<child>
<object class="GtkLabel" id="edge-scrolling-label">
......
......@@ -80,7 +80,10 @@
<property name="can_focus">False</property>
<property name="orientation">horizontal</property>
<property name="spacing">12</property>
<property name="margin">12</property>
<property name="margin_top">9</property>
<property name="margin_bottom">9</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<child>
<object class="GtkLabel" id="label_status">
<property name="visible">True</property>
......
......@@ -35,7 +35,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<property name="margin">12</property>
<property name="margin_top">9</property>
<property name="margin_bottom">9</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
......
......@@ -31,7 +31,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="margin">12</property>
<property name="margin_top">9</property>
<property name="margin_bottom">9</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label_device">
......
......@@ -121,7 +121,10 @@
<object class="GtkGrid">
<property name="visible">True</property>
<property name="border-width">12</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
<property name="column-spacing">12</property>
<property name="row-spacing">2</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
......
......@@ -296,8 +296,8 @@ add_row (CcPrivacyPanel *self,
gtk_widget_set_halign (w, GTK_ALIGN_START);
gtk_widget_set_margin_start (w, 20);
gtk_widget_set_margin_end (w, 20);
gtk_widget_set_margin_top (w, 12);
gtk_widget_set_margin_bottom (w, 12);
gtk_widget_set_margin_top (w, 18);
gtk_widget_set_margin_bottom (w, 18);
gtk_widget_set_halign (w, GTK_ALIGN_START);
gtk_widget_set_valign (w, GTK_ALIGN_CENTER);
gtk_widget_set_hexpand (w, TRUE);
......
......@@ -846,8 +846,8 @@ add_input_row (CcRegionPanel *self,
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_margin_start (label, 20);
gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 12);
gtk_widget_set_margin_bottom (label, 12);
gtk_widget_set_margin_top (label, 18);
gtk_widget_set_margin_bottom (label, 18);
gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
if (strcmp (type, INPUT_SOURCE_TYPE_IBUS) == 0) {
......
......@@ -61,8 +61,8 @@
<property name="can_focus">False</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="margin_top">18</property>
<property name="margin_bottom">18</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Language</property>
<property name="use_underline">True</property>
......@@ -80,8 +80,8 @@
<property name="xalign">1</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="margin_top">18</property>
<property name="margin_bottom">18</property>
<property name="label" translatable="yes">English (United Kingdom)</property>
</object>
<packing>
......@@ -163,8 +163,8 @@
<property name="can_focus">False</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="margin_top">18</property>
<property name="margin_bottom">18</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Formats</property>
<property name="use_underline">True</property>
......@@ -182,8 +182,8 @@
<property name="xalign">1</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="margin_top">18</property>
<property name="margin_bottom">18</property>
<property name="label" translatable="yes">United Kingdom</property>
</object>
<packing>
......
......@@ -89,7 +89,10 @@
<property name="visible">True</property>
<child>
<object class="GtkBox" id="box2">
<property name="border-width">12</property>
<property name="margin_top">18</property>
<property name="margin_bottom">18</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
......@@ -129,7 +132,10 @@
<property name="visible">True</property>
<child>
<object class="GtkBox" id="box3">
<property name="border-width">12</property>
<property name="margin_top">18</property>
<property name="margin_bottom">18</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
......@@ -169,7 +175,10 @@
<property name="visible">True</property>
<child>
<object class="GtkBox" id="box4">
<property name="border-width">12</property>
<property name="margin_top">18</property>
<property name="margin_bottom">18</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
......@@ -209,7 +218,10 @@
<property name="visible">True</property>
<child>
<object class="GtkBox" id="box5">
<property name="border-width">12</property>
<property name="margin_top">18</property>
<property name="margin_bottom">18</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment