[gnome-maps] Remove deprecated GTK+ properties



commit b7592d8bcd53de2c496fcd44972465e35ab11c22
Author: Jonas Danielsson <jonas threetimestwo org>
Date:   Thu Aug 14 21:45:24 2014 +0200

    Remove deprecated GTK+ properties
    
    The GtkMisc align- and pad properties are deprecated, instead
    we should use the alignment and margin properties from GtkWidget.

 src/sidebar.ui     |   15 ++++++++-------
 src/zoomControl.js |    2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/src/sidebar.ui b/src/sidebar.ui
index 5416e01..0aa85bc 100644
--- a/src/sidebar.ui
+++ b/src/sidebar.ui
@@ -19,8 +19,8 @@
         <property name="vexpand">False</property>
         <property name="orientation">vertical</property>
         <property name="row_spacing">12</property>
-        <property name="margin_left">12</property>
-        <property name="margin_right">12</property>
+        <property name="margin_start">12</property>
+        <property name="margin_end">12</property>
         <property name="margin_top">12</property>
         <property name="margin_bottom">0</property>
         <child>
@@ -35,7 +35,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="xalign">0.5</property>
                 <property name="draw_indicator">False</property>
                 <child>
                   <object class="GtkImage" id="mode-pedestrian-image">
@@ -60,7 +59,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="xalign">0.5</property>
                 <property name="draw_indicator">False</property>
                 <property name="group">mode-pedestrian-toggle</property>
                 <child>
@@ -86,7 +84,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="xalign">0.5</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">False</property>
                 <property name="group">mode-bike-toggle</property>
@@ -180,7 +177,8 @@
       <object class="GtkImage" id="direction-image">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xpad">2</property>
+        <property name="margin-start">2</property>
+        <property name="margin-end">2</property>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -193,8 +191,11 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="halign">start</property>
+        <!-- Somehow we need this xalign, otherwise multi-line -->
+        <!-- labels does not get left-aligned. -->
         <property name="xalign">0</property>
-        <property name="ypad">3</property>
+        <property name="margin-top">3</property>
+        <property name="margin-bottom">3</property>
         <property name="use_underline">True</property>
         <property name="wrap">True</property>
         <property name="ellipsize">end</property>
diff --git a/src/zoomControl.js b/src/zoomControl.js
index 569e237..7081a49 100644
--- a/src/zoomControl.js
+++ b/src/zoomControl.js
@@ -32,7 +32,7 @@ const ZoomControl = new Lang.Class({
         this.parent({ halign: Gtk.Align.START,
                       valign: Gtk.Align.START,
                       margin_top: 20,
-                      margin_left: 20,
+                      margin_start: 20,
                       visible: true });
 
         let ui = Utils.getUIObject('zoom-control', ['zoom-control',


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