From 067ae5de5b42169d0105ce1deb1147f640308d27 Mon Sep 17 00:00:00 2001

From: Ray Strode <rstrode@redhat.com>

Date: Mon, 10 Nov 2014 14:36:07 -0500

Subject: [PATCH 01/19] loginDialog: allocate children manually

The login screen is pretty custom full screen container and the standard

layout managers aren't really a good fit for the kind of layout that's

happening. This will be even more problematic with upcoming changes

to login banners, so we need to switch techniques.

This commit moves login dialog over to using a custom allocate handler

that has specific domain knowledge of the parts of the login screen

and where they go.

https://bugzilla.gnome.org/show_bug.cgi?id=703972

---

 js/gdm/loginDialog.js | 94 ++++++++++++++++++++++++++++++++++++++++++++++-----

 1 file changed, 85 insertions(+), 9 deletions(-)

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js

index 7fbeb3e..ced6fc2 100644

--- a/js/gdm/loginDialog.js

+++ b/js/gdm/loginDialog.js

@@ -368,12 +368,12 @@ const LoginDialog = new Lang.Class({

     Name: 'LoginDialog',

     _init: function(parentActor) {

-        this.actor = new St.Widget({ accessible_role: Atk.Role.WINDOW,

-                                     layout_manager: new Clutter.BinLayout(),

-                                     style_class: 'login-dialog',

-                                     visible: false });

+        this.actor = new Shell.GenericContainer({ style_class: 'login-dialog',

+                                                  visible: false });

+        this.actor.get_accessible().set_role(Atk.Role.WINDOW);

         this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));

+        this.actor.connect('allocate', Lang.bind(this, this._onAllocate));

         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));

         parentActor.add_child(this.actor);

@@ -409,8 +409,6 @@ const LoginDialog = new Lang.Class({

         this._userSelectionBox = new St.BoxLayout({ style_class: 'login-dialog-user-selection-box',

                                                     x_align: Clutter.ActorAlign.CENTER,

                                                     y_align: Clutter.ActorAlign.CENTER,

-                                                    x_expand: true,

-                                                    y_expand: true,

                                                     vertical: true,

                                                     visible: false });

         this.actor.add_child(this._userSelectionBox);

@@ -456,9 +454,7 @@ const LoginDialog = new Lang.Class({

         this._logoBin = new St.Widget({ style_class: 'login-dialog-logo-bin',

                                         x_align: Clutter.ActorAlign.CENTER,

-                                        y_align: Clutter.ActorAlign.END,

-                                        x_expand: true,

-                                        y_expand: true });

+                                        y_align: Clutter.ActorAlign.END });

         this.actor.add_child(this._logoBin);

         this._updateLogo();

@@ -489,6 +485,86 @@ const LoginDialog = new Lang.Class({

                                                              Lang.bind(this, this._updateDisableUserList));

     },

+    _getLogoBinAllocation: function (dialogBox) {

+        let actorBox = new Clutter.ActorBox();

+

+        let [minWidth, minHeight, natWidth, natHeight] = this._logoBin.get_preferred_size();

+        let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;

+

+        actorBox.x1 = centerX - natWidth / 2;

+        actorBox.y1 = dialogBox.y2 - natHeight;

+        actorBox.x2 = actorBox.x1 + natWidth;

+        actorBox.y2 = actorBox.y1 + natHeight;

+

+        return actorBox;

+    },

+

+    _getCenterActorAllocation: function (dialogBox, actor) {

+        let actorBox = new Clutter.ActorBox();

+

+        let [minWidth, minHeight, natWidth, natHeight] = actor.get_preferred_size();

+        let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;

+        let centerY = dialogBox.y1 + (dialogBox.y2 - dialogBox.y1) / 2;

+

+        actorBox.x1 = centerX - natWidth / 2;

+        actorBox.y1 = centerY - natHeight / 2;

+        actorBox.x2 = actorBox.x1 + natWidth;

+        actorBox.y2 = actorBox.y1 + natHeight;

+

+        return actorBox;

+    },

+

+    _onAllocate: function (actor, dialogBox, flags) {

+        let dialogHeight = dialogBox.y2 - dialogBox.y1;

+

+        // First find out what space the children require

+        let authPromptAllocation = null;

+        if (this._authPrompt.actor.visible)

+            authPromptAllocation = this._getCenterActorAllocation(dialogBox, this._authPrompt.actor);

+

+        let userSelectionAllocation = null;

+        let userSelectionHeight = 0;

+        if (this._userSelectionBox.visible) {

+            userSelectionAllocation = this._getCenterActorAllocation(dialogBox, this._userSelectionBox);

+            userSelectionHeight = userSelectionAllocation.y2 - userSelectionAllocation.y1;

+        }

+

+        let logoAllocation = null;

+        let logoHeight = 0;

+        if (this._logoBin.visible) {

+            logoAllocation = this._getLogoBinAllocation(dialogBox);

+            logoHeight = logoAllocation.y2 - logoAllocation.y1;

+        }

+

+        // Then figure out what extra space we can hand out

+        let leftOverYSpace = dialogHeight - userSelectionHeight - logoHeight;

+        if (leftOverYSpace > 0) {

+            if (userSelectionAllocation) {

+                let topExpansion = leftOverYSpace / 2;

+

+                // Don't ever expand more than we have space for

+                if (userSelectionAllocation.y1 - topExpansion < 0)

+                    topExpansion = userSelectionAllocation.y1;

+

+                // Always expand the bottom the same as the top since it's centered

+                let bottomExpansion = topExpansion;

+

+                userSelectionAllocation.y1 -= topExpansion;

+                userSelectionAllocation.y2 += bottomExpansion;

+            }

+        }

+

+        // Finally hand out the allocations

+        if (authPromptAllocation)

+            this._authPrompt.actor.allocate(authPromptAllocation, flags);

+

+        if (userSelectionAllocation)

+            this._userSelectionBox.allocate(userSelectionAllocation, flags);

+

+        if (logoAllocation)

+            this._logoBin.allocate(logoAllocation, flags);

+    },

+

     _ensureUserListLoaded: function() {

         if (!this._userManager.is_loaded) {

             this._userManagerLoadedId = this._userManager.connect('notify::is-loaded',

-- 

2.5.0

From b9975d16c2d253bf5636d6ad95e0c22d2b93d05a Mon Sep 17 00:00:00 2001

From: Ray Strode <rstrode@redhat.com>

Date: Tue, 11 Nov 2014 09:11:01 -0500

Subject: [PATCH 02/19] loginDialog: display banner message when

 disable-user-list=true

The login screen supports showing a banner message which admins

can use to mention login rules or disclaimers.

This message only shows up currently if the user list is enabled.

Most people who want to show a banner message also want to disable

the user list.

This commit moves the banner message to display when the user is

prompted for login credentials instead of when showing the user

list. It also adds a scrollbar if the message is too long.

https://bugzilla.gnome.org/show_bug.cgi?id=703972

---

 data/theme/gnome-shell.css |   8 ++--

 js/gdm/loginDialog.js      | 105 +++++++++++++++++++++++++++++++++++++++------

 2 files changed, 95 insertions(+), 18 deletions(-)

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css

index 04994fa..2ec51b2 100644

--- a/data/theme/gnome-shell.css

+++ b/data/theme/gnome-shell.css

@@ -2392,6 +2392,10 @@ StScrollBar StButton#vhandle:active {

 }

 /* Login Dialog */

+.login-dialog-banner-view {

+    padding-top: 24px;

+    max-width: 23em;

+}

 .framed-user-icon {

     border: 2px solid #8b8b8b;

@@ -2404,11 +2408,7 @@ StScrollBar StButton#vhandle:active {

 }

 .login-dialog-banner {

-    font-size: 10pt;

-    font-weight: bold;

-    text-align: center;

     color: #666666;

-    padding-bottom: 1em;

 }

 .login-dialog {

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js

index ced6fc2..41aa89c 100644

--- a/js/gdm/loginDialog.js

+++ b/js/gdm/loginDialog.js

@@ -27,6 +27,7 @@ const Gtk = imports.gi.Gtk;

 const Lang = imports.lang;

 const Mainloop = imports.mainloop;

 const Meta = imports.gi.Meta;

+const Pango = imports.gi.Pango;

 const Shell = imports.gi.Shell;

 const Signals = imports.signals;

 const St = imports.gi.St;

@@ -413,11 +414,6 @@ const LoginDialog = new Lang.Class({

                                                     visible: false });

         this.actor.add_child(this._userSelectionBox);

-        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',

-                                           text: '' });

-        this._userSelectionBox.add(this._bannerLabel);

-        this._updateBanner();

-

         this._userList = new UserList();

         this._userSelectionBox.add(this._userList.actor,

                                    { expand: true,

@@ -452,6 +448,22 @@ const LoginDialog = new Lang.Class({

                                      x_align: St.Align.START,

                                      x_fill: true });

+        this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',

+                                               opacity: 0,

+                                               vscrollbar_policy: Gtk.PolicyType.AUTOMATIC,

+                                               hscrollbar_policy: Gtk.PolicyType.NEVER });

+        this.actor.add_child(this._bannerView);

+

+        let bannerBox = new St.BoxLayout({ vertical: true });

+

+        this._bannerView.add_actor(bannerBox);

+        this._bannerLabel = new St.Label({ style_class: 'login-dialog-banner',

+                                           text: '' });

+        this._bannerLabel.clutter_text.line_wrap = true;

+        this._bannerLabel.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;

+        bannerBox.add_child(this._bannerLabel);

+        this._updateBanner();

+

         this._logoBin = new St.Widget({ style_class: 'login-dialog-logo-bin',

                                         x_align: Clutter.ActorAlign.CENTER,

                                         y_align: Clutter.ActorAlign.END });

@@ -485,6 +497,20 @@ const LoginDialog = new Lang.Class({

                                                              Lang.bind(this, this._updateDisableUserList));

     },

+    _getBannerAllocation: function (dialogBox) {

+        let actorBox = new Clutter.ActorBox();

+

+        let [minWidth, minHeight, natWidth, natHeight] = this._bannerView.get_preferred_size();

+        let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;

+

+        actorBox.x1 = centerX - natWidth / 2;

+        actorBox.y1 = dialogBox.y1 + Main.layoutManager.panelBox.height;

+        actorBox.x2 = actorBox.x1 + natWidth;

+        actorBox.y2 = actorBox.y1 + natHeight;

+

+        return actorBox;

+    },

+

     _getLogoBinAllocation: function (dialogBox) {

         let actorBox = new Clutter.ActorBox();

@@ -518,9 +544,21 @@ const LoginDialog = new Lang.Class({

         let dialogHeight = dialogBox.y2 - dialogBox.y1;

         // First find out what space the children require

+        let bannerAllocation = null;

+        let bannerHeight = 0;

+        let bannerWidth = 0;

+        if (this._bannerView.visible) {

+            bannerAllocation = this._getBannerAllocation(dialogBox, this._bannerView);

+            bannerHeight = bannerAllocation.y2 - bannerAllocation.y1;

+            bannerWidth = bannerAllocation.x2 - bannerAllocation.x1;

+        }

+

         let authPromptAllocation = null;

-        if (this._authPrompt.actor.visible)

+        let authPromptHeight = 0;

+        if (this._authPrompt.actor.visible) {

             authPromptAllocation = this._getCenterActorAllocation(dialogBox, this._authPrompt.actor);

+            authPromptHeight = authPromptAllocation.y2 - authPromptAllocation.y1;

+        }

         let userSelectionAllocation = null;

         let userSelectionHeight = 0;

@@ -537,16 +575,37 @@ const LoginDialog = new Lang.Class({

         }

         // Then figure out what extra space we can hand out

-        let leftOverYSpace = dialogHeight - userSelectionHeight - logoHeight;

-        if (leftOverYSpace > 0) {

-            if (userSelectionAllocation) {

-                let topExpansion = leftOverYSpace / 2;

+        if (bannerAllocation) {

+            let leftOverYSpace = dialogHeight - bannerHeight - authPromptHeight - logoHeight;

+

+            if (leftOverYSpace > 0) {

+                 // First figure out how much left over space is up top

+                 let leftOverTopSpace = leftOverYSpace / 2;

-                // Don't ever expand more than we have space for

-                if (userSelectionAllocation.y1 - topExpansion < 0)

-                    topExpansion = userSelectionAllocation.y1;

+                 // Then, shift the banner into the middle of that extra space

+                 let yShift = leftOverTopSpace / 2;

+

+                 bannerAllocation.y1 += yShift;

+                 bannerAllocation.y2 += yShift;

+            } else {

+                 // recompute banner height to be constrained if there's no room for its

+                 // requested height

+

+                 // First figure out how much space there is without the banner

+                 leftOverYSpace += bannerHeight;

+

+                 // Then figure out how much of that space is up top

+                 let availableTopSpace = leftOverYSpace / 2;

+

+                 // Then give all of that space to the banner

+                 bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;

+            }

+        } else if (userSelectionAllocation) {

+            // Grow the user list to fill the space

+            let leftOverYSpace = dialogHeight - userSelectionHeight - logoHeight;

-                // Always expand the bottom the same as the top since it's centered

+            if (leftOverYSpace > 0) {

+                let topExpansion = leftOverYSpace / 2;

                 let bottomExpansion = topExpansion;

                 userSelectionAllocation.y1 -= topExpansion;

@@ -555,6 +614,10 @@ const LoginDialog = new Lang.Class({

         }

         // Finally hand out the allocations

+        if (bannerAllocation) {

+            this._bannerView.allocate(bannerAllocation, flags);

+        }

+

         if (authPromptAllocation)

             this._authPrompt.actor.allocate(authPromptAllocation, flags);

@@ -617,6 +680,18 @@ const LoginDialog = new Lang.Class({

         }

     },

+    _fadeInBannerView: function() {

+        Tweener.addTween(this._bannerView,

+                         { opacity: 255,

+                           time: _FADE_ANIMATION_TIME,

+                           transition: 'easeOutQuad' });

+    },

+

+    _hideBannerView: function() {

+        Tweener.removeTweens(this._bannerView);

+        this._bannerView.opacity = 0;

+    },

+

     _updateLogoTexture: function(cache, uri) {

         if (this._logoFileUri != uri)

             return;

@@ -684,6 +759,7 @@ const LoginDialog = new Lang.Class({

                          { opacity: 255,

                            time: _FADE_ANIMATION_TIME,

                            transition: 'easeOutQuad' });

+        this._fadeInBannerView();

     },

     _showRealmLoginHint: function(realmManager, hint) {

@@ -940,6 +1016,7 @@ const LoginDialog = new Lang.Class({

     _showUserList: function() {

         this._ensureUserListLoaded();

         this._authPrompt.hide();

+        this._hideBannerView();

         this._sessionMenuButton.close();

         this._setUserListExpanded(true);

         this._notListedButton.show();

-- 

2.5.0

From 5c2fb5d1d1ace07e2f9c27d563289e315fe53509 Mon Sep 17 00:00:00 2001

From: Ray Strode <rstrode@redhat.com>

Date: Tue, 11 Nov 2014 09:11:01 -0500

Subject: [PATCH 03/19] loginDialog: use two column view if banner message long

Frequently banner messages are longer than can reasonable

fit in a one column view, which leads to a smooshed layout.

This commit changes the layout to a two column view, with the

banner on the left and the prompt on the right, if the banner

message is long enough that it can't fit well above the prompt.

If there isn't enough space for two columns then we keep the

one column layout but add scrollbars.

https://bugzilla.gnome.org/show_bug.cgi?id=703972

---

 js/gdm/loginDialog.js | 67 ++++++++++++++++++++++++++++++++++++++++++---------

 1 file changed, 55 insertions(+), 12 deletions(-)

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js

index 41aa89c..575effa 100644

--- a/js/gdm/loginDialog.js

+++ b/js/gdm/loginDialog.js

@@ -541,6 +541,7 @@ const LoginDialog = new Lang.Class({

     },

     _onAllocate: function (actor, dialogBox, flags) {

+        let dialogWidth = dialogBox.x2 - dialogBox.x1;

         let dialogHeight = dialogBox.y2 - dialogBox.y1;

         // First find out what space the children require

@@ -555,9 +556,11 @@ const LoginDialog = new Lang.Class({

         let authPromptAllocation = null;

         let authPromptHeight = 0;

+        let authPromptWidth = 0;

         if (this._authPrompt.actor.visible) {

             authPromptAllocation = this._getCenterActorAllocation(dialogBox, this._authPrompt.actor);

             authPromptHeight = authPromptAllocation.y2 - authPromptAllocation.y1;

+            authPromptWidth = authPromptAllocation.x2 - authPromptAllocation.x1;

         }

         let userSelectionAllocation = null;

@@ -574,7 +577,9 @@ const LoginDialog = new Lang.Class({

             logoHeight = logoAllocation.y2 - logoAllocation.y1;

         }

-        // Then figure out what extra space we can hand out

+        // Then figure out if we're overly constrained and need to

+        // try a different layout, or if we have what extra space we

+        // can hand out

         if (bannerAllocation) {

             let leftOverYSpace = dialogHeight - bannerHeight - authPromptHeight - logoHeight;

@@ -588,17 +593,55 @@ const LoginDialog = new Lang.Class({

                  bannerAllocation.y1 += yShift;

                  bannerAllocation.y2 += yShift;

             } else {

-                 // recompute banner height to be constrained if there's no room for its

-                 // requested height

-

-                 // First figure out how much space there is without the banner

-                 leftOverYSpace += bannerHeight;

-

-                 // Then figure out how much of that space is up top

-                 let availableTopSpace = leftOverYSpace / 2;

-

-                 // Then give all of that space to the banner

-                 bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;

+                 // Then figure out how much space there would be if we switched to a

+                 // wide layout with banner on one side and authprompt on the other.

+                 let leftOverXSpace = dialogWidth - authPromptWidth;

+

+                 // In a wide view, half of the available space goes to the banner,

+                 // and the other half goes to the margins.

+                 let wideBannerWidth = leftOverXSpace / 2;

+                 let wideSpacing  = leftOverXSpace - wideBannerWidth;

+

+                 // If we do go with a wide layout, we need there to be at least enough

+                 // space for the banner and the auth prompt to be the same width,

+                 // so it doesn't look unbalanced.

+                 if (authPromptWidth > 0 && wideBannerWidth > authPromptWidth) {

+                     let centerX = dialogBox.x1 + dialogWidth / 2;

+                     let centerY = dialogBox.y1 + dialogHeight / 2;

+

+                     // A small portion of the spacing goes down the center of the

+                     // screen to help delimit the two columns of the wide view

+                     let centerGap = wideSpacing / 8;

+

+                     // place the banner along the left edge of the center margin

+                     bannerAllocation.x2 = centerX - centerGap / 2;

+                     bannerAllocation.x1 = bannerAllocation.x2 - wideBannerWidth;

+

+                     // figure out how tall it would like to be and try to accomodate

+                     // but don't let it get too close to the logo

+                     let [wideMinHeight, wideBannerHeight] = this._bannerView.get_preferred_height(wideBannerWidth);

+

+                     let maxWideHeight = dialogHeight - 3 * logoHeight;

+                     wideBannerHeight = Math.min(maxWideHeight, wideBannerHeight);

+                     bannerAllocation.y1 = centerY - wideBannerHeight / 2;

+                     bannerAllocation.y2 = bannerAllocation.y1 + wideBannerHeight;

+

+                     // place the auth prompt along the right edge of the center margin

+                     authPromptAllocation.x1 = centerX + centerGap / 2;

+                     authPromptAllocation.x2 = authPromptAllocation.x1 + authPromptWidth;

+                 } else {

+                     // If we aren't going to do a wide view, then we need to limit

+                     // the height of the banner so it will present scrollbars

+

+                     // First figure out how much space there is without the banner

+                     leftOverYSpace += bannerHeight;

+

+                     // Then figure out how much of that space is up top

+                     let availableTopSpace = leftOverYSpace / 2;

+

+                     // Then give all of that space to the banner

+                     bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;

+                 }

             }

         } else if (userSelectionAllocation) {

             // Grow the user list to fill the space

-- 

2.5.0

From f349bc2c4b437430dfc65d13bba24e39c5ab8c59 Mon Sep 17 00:00:00 2001

From: Ray Strode <rstrode@redhat.com>

Date: Thu, 22 Jan 2015 14:00:01 -0500

Subject: [PATCH 04/19] loginDialog: fix reactivity of first user in user list

After the login banner is shown and hidden, the first user

in the user list becomes non-reactive.  This is because the

banner is given an opacity of 0, but still allocated.

This commit fixes that by hiding the banner explicitly.

https://bugzilla.gnome.org/show_bug.cgi?id=743370

---

 js/gdm/loginDialog.js | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js

index 575effa..930f82b 100644

--- a/js/gdm/loginDialog.js

+++ b/js/gdm/loginDialog.js

@@ -724,6 +724,7 @@ const LoginDialog = new Lang.Class({

     },

     _fadeInBannerView: function() {

+        this._bannerView.show();

         Tweener.addTween(this._bannerView,

                          { opacity: 255,

                            time: _FADE_ANIMATION_TIME,

@@ -733,6 +734,7 @@ const LoginDialog = new Lang.Class({

     _hideBannerView: function() {

         Tweener.removeTweens(this._bannerView);

         this._bannerView.opacity = 0;

+        this._bannerView.hide();

     },

     _updateLogoTexture: function(cache, uri) {

-- 

2.5.0

From 4c16f0573d5b72ffb99261692353d004d4e13337 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Cl=C3=A9ment=20Gu=C3=A9rin?= <geecko.dev@free.fr>

Date: Fri, 27 Mar 2015 22:19:47 +0100

Subject: [PATCH 05/19] gdm: use integer coordinates for login dialog actors

If the login screen actors aren't placed at pixel

boundaries then they will show up blurred with fuzzy

text.

This commit ensures all actor allocations are floored

to integer coordinates.

https://bugzilla.gnome.org/show_bug.cgi?id=746912

---

 js/gdm/loginDialog.js | 22 +++++++++++-----------

 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js

index 930f82b..34bef7d 100644

--- a/js/gdm/loginDialog.js

+++ b/js/gdm/loginDialog.js

@@ -503,7 +503,7 @@ const LoginDialog = new Lang.Class({

         let [minWidth, minHeight, natWidth, natHeight] = this._bannerView.get_preferred_size();

         let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;

-        actorBox.x1 = centerX - natWidth / 2;

+        actorBox.x1 = Math.floor(centerX - natWidth / 2);

         actorBox.y1 = dialogBox.y1 + Main.layoutManager.panelBox.height;

         actorBox.x2 = actorBox.x1 + natWidth;

         actorBox.y2 = actorBox.y1 + natHeight;

@@ -517,7 +517,7 @@ const LoginDialog = new Lang.Class({

         let [minWidth, minHeight, natWidth, natHeight] = this._logoBin.get_preferred_size();

         let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;

-        actorBox.x1 = centerX - natWidth / 2;

+        actorBox.x1 = Math.floor(centerX - natWidth / 2);

         actorBox.y1 = dialogBox.y2 - natHeight;

         actorBox.x2 = actorBox.x1 + natWidth;

         actorBox.y2 = actorBox.y1 + natHeight;

@@ -532,8 +532,8 @@ const LoginDialog = new Lang.Class({

         let centerX = dialogBox.x1 + (dialogBox.x2 - dialogBox.x1) / 2;

         let centerY = dialogBox.y1 + (dialogBox.y2 - dialogBox.y1) / 2;

-        actorBox.x1 = centerX - natWidth / 2;

-        actorBox.y1 = centerY - natHeight / 2;

+        actorBox.x1 = Math.floor(centerX - natWidth / 2);

+        actorBox.y1 = Math.floor(centerY - natHeight / 2);

         actorBox.x2 = actorBox.x1 + natWidth;

         actorBox.y2 = actorBox.y1 + natHeight;

@@ -588,7 +588,7 @@ const LoginDialog = new Lang.Class({

                  let leftOverTopSpace = leftOverYSpace / 2;

                  // Then, shift the banner into the middle of that extra space

-                 let yShift = leftOverTopSpace / 2;

+                 let yShift = Math.floor(leftOverTopSpace / 2);

                  bannerAllocation.y1 += yShift;

                  bannerAllocation.y2 += yShift;

@@ -614,8 +614,8 @@ const LoginDialog = new Lang.Class({

                      let centerGap = wideSpacing / 8;

                      // place the banner along the left edge of the center margin

-                     bannerAllocation.x2 = centerX - centerGap / 2;

-                     bannerAllocation.x1 = bannerAllocation.x2 - wideBannerWidth;

+                     bannerAllocation.x2 = Math.floor(centerX - centerGap / 2);

+                     bannerAllocation.x1 = Math.floor(bannerAllocation.x2 - wideBannerWidth);

                      // figure out how tall it would like to be and try to accomodate

                      // but don't let it get too close to the logo

@@ -623,11 +623,11 @@ const LoginDialog = new Lang.Class({

                      let maxWideHeight = dialogHeight - 3 * logoHeight;

                      wideBannerHeight = Math.min(maxWideHeight, wideBannerHeight);

-                     bannerAllocation.y1 = centerY - wideBannerHeight / 2;

+                     bannerAllocation.y1 = Math.floor(centerY - wideBannerHeight / 2);

                      bannerAllocation.y2 = bannerAllocation.y1 + wideBannerHeight;

                      // place the auth prompt along the right edge of the center margin

-                     authPromptAllocation.x1 = centerX + centerGap / 2;

+                     authPromptAllocation.x1 = Math.floor(centerX + centerGap / 2);

                      authPromptAllocation.x2 = authPromptAllocation.x1 + authPromptWidth;

                  } else {

                      // If we aren't going to do a wide view, then we need to limit

@@ -637,7 +637,7 @@ const LoginDialog = new Lang.Class({

                      leftOverYSpace += bannerHeight;

                      // Then figure out how much of that space is up top

-                     let availableTopSpace = leftOverYSpace / 2;

+                     let availableTopSpace = Math.floor(leftOverYSpace / 2);

                      // Then give all of that space to the banner

                      bannerAllocation.y2 = bannerAllocation.y1 + availableTopSpace;

@@ -648,7 +648,7 @@ const LoginDialog = new Lang.Class({

             let leftOverYSpace = dialogHeight - userSelectionHeight - logoHeight;

             if (leftOverYSpace > 0) {

-                let topExpansion = leftOverYSpace / 2;

+                let topExpansion = Math.floor(leftOverYSpace / 2);

                 let bottomExpansion = topExpansion;

                 userSelectionAllocation.y1 -= topExpansion;

-- 

2.5.0

From a179abc0adf73f19aeb4ec8069ffaecd0b229179 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>

Date: Fri, 20 Mar 2015 14:29:40 +0100

Subject: [PATCH 06/19] loginDialog: Move long session-list menus to the side

Currently the menu position below the button means that the menu

can extend to roughly half the screen height before ending up partly

off-screen. This is plenty of space for commonly installed sessions,

but some users have a significantly higher number of sessions in the

list. Move the menu to the side of the button in that case to maximize

the vertical space the menu may take up.

https://bugzilla.gnome.org/show_bug.cgi?id=734352

---

 js/gdm/loginDialog.js | 12 +++++++++++-

 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js

index 34bef7d..bf47c2d 100644

--- a/js/gdm/loginDialog.js

+++ b/js/gdm/loginDialog.js

@@ -49,6 +49,7 @@ const _FADE_ANIMATION_TIME = 0.25;

 const _SCROLL_ANIMATION_TIME = 0.5;

 const _TIMED_LOGIN_IDLE_THRESHOLD = 5.0;

 const _LOGO_ICON_HEIGHT = 48;

+const _MAX_BOTTOM_MENU_ITEMS = 5;

 const UserListItem = new Lang.Class({

     Name: 'UserListItem',

@@ -283,7 +284,16 @@ const SessionMenuButton = new Lang.Class({

         this.actor = new St.Bin({ child: this._button });

-        this._menu = new PopupMenu.PopupMenu(this._button, 0, St.Side.TOP);

+        let side = St.Side.TOP;

+        let align = 0;

+        if (Gdm.get_session_ids().length > _MAX_BOTTOM_MENU_ITEMS) {

+            if (this.actor.text_direction == Clutter.TextDirection.RTL)

+                side = St.Side.RIGHT;

+            else

+                side = St.Side.LEFT;

+            align = 0.5;

+        }

+        this._menu = new PopupMenu.PopupMenu(this._button, align, side);

         Main.uiGroup.add_actor(this._menu.actor);

         this._menu.actor.hide();

-- 

2.5.0

From cd87ad4e3f9aa3e18f35f6f4069412412eeb1977 Mon Sep 17 00:00:00 2001

From: Ray Strode <rstrode@redhat.com>

Date: Mon, 16 Mar 2015 07:38:04 -0400

Subject: [PATCH 07/19] gdm: fix empty user list on user switching

There's some vestigial code for hiding the user list

that runs at the same time its parent is hidden.

Only the parent should be hidden, at this point, so