[gnome-maps] sidebar: Improve entry margins

[Jonas Danielsson <jonasdn src gnome org>]

commit 5a07357f3cb8264bbac1dd13739915ea2ff8285f
Author: Jonas Danielsson <jonas danielsson threetimestwo org>
Date:   Wed Sep 3 15:18:16 2014 -0300

    sidebar: Improve entry margins
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735858

 src/route-via-row.ui |   11 ++++++-----
 src/sidebar.js       |    3 +--
 src/sidebar.ui       |   34 ++++++++++++++++++++++------------
 3 files changed, 29 insertions(+), 19 deletions(-)
---
diff --git a/src/route-via-row.ui b/src/route-via-row.ui
index 17b2034..a46eb37 100644
--- a/src/route-via-row.ui
+++ b/src/route-via-row.ui
@@ -4,21 +4,20 @@
   <object class="GtkGrid" id="via-grid">
     <property name="visible">True</property>
     <property name="orientation">horizontal</property>
+    <property name="hexpand">False</property>
     <child>
       <object class="GtkImage" id="via-image">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin_top">0</property>
-        <property name="margin_bottom">0</property>
-        <property name="width-request">32</property>
+        <property name="margin-end">21</property>
+        <property name="width-request">16</property>
       </object>
     </child>
     <child>
       <object class="GtkGrid" id="via-entry-grid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
       </object>
     </child>
     <child>
@@ -27,6 +26,8 @@
         <property name="can-focus">True</property>
         <property name="valign">center</property>
         <property name="height-request">31</property>
+        <property name="margin-start">4</property>
+        <property name="margin-end">10</property>
         <child>
           <object class="GtkImage" id="via-remove-image">
             <property name="visible">True</property>
diff --git a/src/sidebar.js b/src/sidebar.js
index 74efcdb..4fa76e2 100644
--- a/src/sidebar.js
+++ b/src/sidebar.js
@@ -119,9 +119,8 @@ const Sidebar = new Lang.Class({
     _createPlaceEntry: function() {
         return new PlaceEntry.PlaceEntry({ visible: true,
                                            can_focus: true,
+                                           hexpand: true,
                                            receives_default: true,
-                                           margin_start: 5,
-                                           width_request: 220,
                                            mapView: this._mapView });
     },
 
diff --git a/src/sidebar.ui b/src/sidebar.ui
index 865f3c3..dc2533a 100644
--- a/src/sidebar.ui
+++ b/src/sidebar.ui
@@ -93,23 +93,22 @@
       <object class="GtkGrid" id="from-grid">
         <property name="visible">True</property>
         <property name="orientation">horizontal</property>
-        <property name="margin_start">12</property>
-        <property name="margin_end">12</property>
         <property name="margin_top">12</property>
+        <property name="hexpand">False</property>
         <child>
           <object class="GtkImage" id="from-image">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">end</property>
-            <property name="margin-start">10</property>
-            <property name="margin-end">5</property>
-            <property name="width-request">32</property>
+            <property name="margin-start">15</property>
+            <property name="margin-end">8</property>
+            <property name="width-request">16</property>
             <property name="icon-name">maps-point-start-symbolic</property>
           </object>
         </child>
         <child>
           <object class="GtkGrid" id="from-entry-grid">
             <property name="visible">True</property>
+            <property name="hexpand">True</property>
             <property name="can_focus">False</property>
           </object>
         </child>
@@ -118,7 +117,10 @@
             <property name="visible">True</property>
             <property name="can-focus">True</property>
             <property name="valign">center</property>
+            <property name="margin-start">4</property>
+            <property name="margin-end">12</property>
             <property name="height-request">31</property>
+            <property name="width-request">31</property>
             <child>
               <object class="GtkImage" id="via-add-image">
                 <property name="visible">True</property>
@@ -142,15 +144,14 @@
         <property name="visible">True</property>
         <property name="orientation">horizontal</property>
         <property name="vexpand">False</property>
-        <property name="margin_start">12</property>
-        <property name="margin_end">12</property>
+        <property name="hexpand">False</property>
         <child>
           <object class="GtkImage" id="to-image">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin-start">10</property>
-            <property name="margin-end">5</property>
-            <property name="width-request">32</property>
+            <property name="margin-start">15</property>
+            <property name="margin-end">8</property>
+            <property name="width-request">16</property>
             <property name="icon-name">maps-point-end-symbolic</property>
           </object>
         </child>
@@ -158,6 +159,16 @@
           <object class="GtkGrid" id="to-entry-grid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkGrid" id="to-placeholder-grid">
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="margin-end">19</property>
+            <property name="height-request">31</property>
+            <property name="width-request">31</property>
           </object>
         </child>
       </object>
@@ -168,7 +179,6 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="margin_start">17</property>
-        <property name="margin_end">12</property>
         <property name="margin_top">12</property>
         <child>
           <object class="GtkLabel" id="time-info">