Merge lp:~feng-kylin/kylin-greeter/fixgtk320 into lp:~zctgbhu/kylin-greeter/trunk

[handsome_feng]

Fixed the issue when upgrade to gtk3.20.

[lp:~feng-kylin/kylin-greeter/fixgtk320]

73. By handsome_feng on 2016-09-27

Added queue_resize and Allocation

[zhangchao (zctgbhu)]

great！3Q

review: Approve

=== modified file 'src/dash-button.vala'
--- src/dash-button.vala	2015-12-04 08:45:17 +0000
+++ src/dash-button.vala	2016-09-27 06:57:50 +0000
@@ -70,7 +70,7 @@
         {
             var style = new Gtk.CssProvider ();
             style.load_from_data ("* {padding: 6px 8px 6px 8px;
-                                      -GtkWidget-focus-line-width: 0px;
+                                      -GtkWidget-outline-width: 0px;
                                      }", -1);
             this.get_style_context ().add_provider (style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
         }

=== modified file 'src/flat-button.vala'
--- src/flat-button.vala	2015-12-04 08:45:17 +0000
+++ src/flat-button.vala	2016-09-27 06:57:50 +0000
@@ -29,9 +29,8 @@
         try
         {
             var style = new Gtk.CssProvider ();
-            style.load_from_data ("* {-GtkButton-child-displacement-x: 0px;
-                                      -GtkButton-child-displacement-y: 0px;
-                                      -GtkWidget-focus-line-width: 0px;
+            style.load_from_data ("* {
+                                      -GtkWidget-outline-width: 0px;
                                       }", -1);
             get_style_context ().add_provider (style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
         }

=== modified file 'src/greeter-list.vala'
--- src/greeter-list.vala	2016-06-12 06:58:31 +0000
+++ src/greeter-list.vala	2016-09-27 06:57:50 +0000
@@ -757,6 +757,8 @@
         /* Stop when we get there */
         if (progress >= 1.0)
             finished_scrolling ();
+
+        queue_resize ();
     }
 
     private void finished_scrolling ()
@@ -931,16 +933,17 @@
     {
         if(status==Status.LOGINBOX)
         {
-            debug("~~~~~~~~back_userlist_cb");
             status=Status.USERLIST;
             
             move_names ();
             UnityGreeter.singleton.set_scroll_button_status();
             selected_entry.hide_prompts();
         }else if(status==Status.SESSIONLIST)
-        {debug("~~~~~~~~back_userlist_cb,back_loginbox");
+        {
             UnityGreeter.singleton.pop_list();
         }
+
+        queue_resize ();
     }
     
     /* Not all subclasses are going to be interested in talking to lightdm, but for those that are, make it easy. */

=== modified file 'src/main-window.vala'
--- src/main-window.vala	2016-08-17 03:23:49 +0000
+++ src/main-window.vala	2016-09-27 06:57:50 +0000
@@ -225,10 +225,9 @@
         
         //add bottom_box
         var bottom_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-        bottom_box.expand = true;
         bottom_box.show ();
+        bottom_box.set_size_request (-1, BOTTOM_HEIGHT);
         login_box.add (bottom_box);
-        scroll_down_button_align.set_size_request (-1,BOTTOM_HEIGHT);
         
         if (UnityGreeter.singleton.test_mode)
         {
@@ -453,6 +452,9 @@
     private void move_to_monitor (Monitor monitor)
     {
         active_monitor = monitor;
+        var alloc = Gtk.Allocation();
+        alloc.width = monitor.width;
+        login_box.size_allocate_with_baseline(alloc, -1);
         login_box.set_size_request (monitor.width, monitor.height);
         stack.set_size(monitor.width,monitor.height-BUTTONBOX_HEIGHT-SCROLL_BUTTON_HEIGHT*2-BOTTOM_HEIGHT);
        

=== modified file 'src/prompt-box.vala'
--- src/prompt-box.vala	2016-08-17 03:23:49 +0000
+++ src/prompt-box.vala	2016-09-27 06:57:50 +0000
@@ -711,7 +711,7 @@
     {
         base.size_allocate (allocation);
         box_grid.size_allocate (allocation);
-        //debug("~~~~~~~~allocation.x=%d~~allocation.y=%d~~allocation.height=%d~~allocation.width=%d",allocation.x,allocation.y,allocation.height,allocation.width);
+        //debug("allocation=%d:%d:%d:%d",allocation.x,allocation.y,allocation.height,allocation.width);
         int small_height;
         small_box_widget.get_preferred_height (null, out small_height);
         allocation.height = small_height;

=== modified file 'src/user-list.vala'
--- src/user-list.vala	2016-06-07 09:28:43 +0000
+++ src/user-list.vala	2016-09-27 06:57:50 +0000
@@ -642,6 +642,7 @@
         var userbox = selected_entry as UserPromptBox;
         if (userbox != null)
             selected_entry.set_is_active (userbox.is_active);
+        queue_resize ();
     }
 
     private void entry_selected_cb (string? username)