Merge lp:~donadigo/pantheon-greeter/fix-time-position into lp:~elementary-pantheon/pantheon-greeter/trunk

[Adam Bieńkowski]

* Fix the time label placement as well as fix some hardcoding in the code.

Fixes the time label placement as well as fixes some hardcoding in the code.

* Currently the time label placement is broken because of GTK's having it's anchor point on the middle of the widget causing the label to be in the middle of the edge of the screen.

* transition_running method was broken and caused to having loads of Gtk.Images beacause they were not removed from the stack, I replaced it with a simple timeout.

* I also replaced building the config file path with a native Path.build_filename.

[Danielle Foré (danrabbit)]

Tested and looks good to me :)

=== modified file 'src/PantheonGreeter.vala'
--- src/PantheonGreeter.vala	2016-06-13 03:48:42 +0000
+++ src/PantheonGreeter.vala	2016-06-14 12:52:34 +0000
@@ -104,7 +104,7 @@
         
         settings = new KeyFile ();
         try {
-            settings.load_from_file (Constants.CONF_DIR+"/pantheon-greeter.conf",
+            settings.load_from_file (Path.build_filename (Constants.CONF_DIR, "pantheon-greeter.conf"),
                     KeyFileFlags.KEEP_COMMENTS);
         } catch (Error e) {
             warning (e.message);
@@ -292,12 +292,13 @@
         } else {
             userlist_actor.x = 120 * ((float) (width) / NORMAL_WIDTH);
         }
+
         userlist_actor.y = Math.floorf (height / 2.0f);
 
-        time.x = width - time.width - 100;
+        time.x = width - time.width - time.width / 2 - 100;
         time.y = height / 2 - time.height / 2;
 
-        time.visible = width > NO_CLOCK_WIDTH;
+        time.visible = width > NO_CLOCK_WIDTH + time.width / 2;
 
         wallpaper.width = width;
         wallpaper.screen_width = width;
 
=== modified file 'src/TimeLabel.vala'
--- src/TimeLabel.vala	2016-06-09 19:03:57 +0000
+++ src/TimeLabel.vala	2016-06-14 12:52:34 +0000
@@ -32,7 +32,6 @@
         var container_widget = (Gtk.Container)this.get_widget ();
 
         var layout = new Gtk.Grid ();
-        layout.margin = 16;
 
         date_label = new Gtk.Label ("");
         date_label.get_style_context ().add_class ("h2");
 
=== modified file 'src/Wallpaper.vala'
--- src/Wallpaper.vala	2016-06-13 17:51:40 +0000
+++ src/Wallpaper.vala	2016-06-14 12:52:34 +0000
@@ -119,9 +119,10 @@
             foreach (var other_wallpaper in wallpapers) {
                 wallpapers.remove (other_wallpaper);
 
-                stack.notify["transition_running"].connect (() => {
+                Timeout.add (stack.transition_duration, () => {
                     stack.remove (other_wallpaper);
                     unused_wallpapers.push_tail (other_wallpaper);
+                    return false;
                 });
             }
             wallpapers.append (new_wallpaper);