Move smoker / non-smoker icon to the top right in the lift detail view

[beifahrer] / src / lift-detail-window.vala

diff --git a/src/lift-detail-window.vala b/src/lift-detail-window.vala
index 35b859d..cc6e667 100644 (file)
--- a/src/lift-detail-window.vala
+++ b/src/lift-detail-window.vala
@@ -66,10 +66,17 @@ public class LiftDetailWindow : StackableWindow {
 
                var vbox = new VBox (false, 0);
 
+               var hbox = new HBox (false, 0);
+
                button_route = new OssoABook.Button (SizeType.FINGER_HEIGHT);
                button_route.style = OssoABook.ButtonStyle.LABEL;
 
-               var table = new Table (5, 2, false);
+               image_smoke = new Image ();
+
+               hbox.pack_start (button_route, true, true, 0);
+               hbox.pack_start (image_smoke, false, false, MARGIN_DEFAULT);
+
+               var table = new Table (4, 2, false);
 
                button_calendar = new OssoABook.Button (SizeType.FINGER_HEIGHT);
                button_calendar.set_icon_name ("general_calendar");
@@ -89,8 +96,6 @@ public class LiftDetailWindow : StackableWindow {
                button_sms.set_icon_visible (true);
                button_sms.title = _("SMS");
 
-               image_smoke = new Image ();
-
                label = new Label ("");
                label.set_alignment (0.0f, 0.5f);
                label.set_line_wrap (true);
@@ -99,10 +104,9 @@ public class LiftDetailWindow : StackableWindow {
                table.attach (label_driver, 0, 1, 1, 2, AttachOptions.FILL | AttachOptions.EXPAND, AttachOptions.FILL, MARGIN_DEFAULT, 0);
                table.attach (button_phone, 1, 2, 1, 2, AttachOptions.FILL | AttachOptions.EXPAND, AttachOptions.FILL, 0, 0);
                table.attach (button_sms, 1, 2, 2, 3, AttachOptions.FILL | AttachOptions.EXPAND, AttachOptions.FILL, 0, 0);
-               table.attach (image_smoke, 1, 2, 3, 4, AttachOptions.FILL | AttachOptions.EXPAND, AttachOptions.FILL, 0, 0);
-               table.attach (label, 0, 2, 4, 5, AttachOptions.FILL | AttachOptions.EXPAND, AttachOptions.FILL, MARGIN_DEFAULT, 0);
+               table.attach (label, 0, 2, 3, 4, AttachOptions.FILL | AttachOptions.EXPAND, AttachOptions.FILL, MARGIN_DEFAULT, 0);
 
-               vbox.pack_start (button_route, true, true, 0);
+               vbox.pack_start (hbox, true, true, 0);
                vbox.pack_start (table, true, true, 0);
 
                pannable.add_with_viewport (vbox);