Whisker Menu - allow modifying session buttons in settings

Author: Andrew Zaech

menuWidgets.js

@@ -1748,7 +1748,9 @@ var UserMenuItem = GObject.registerClass(class ArcMenu_UserMenuItem extends ArcM
         let username = GLib.get_user_name();
         this._user = AccountsService.UserManager.get_default().get_user(username);
         this.iconBin =  new St.Bin({ 
-            style_class: 'menu-user-avatar'
+            style_class: 'menu-user-avatar',
+            y_expand: true,
+            y_align: Clutter.ActorAlign.CENTER
         });
 
         this._userAvatarSize = userAvatarSize ? userAvatarSize : USER_AVATAR_SIZE;

menulayouts/whisker.js

@@ -48,7 +48,7 @@ var createMenu = class extends BaseMenuLayout.BaseLayout{
             vertical: false
         });
 
-        this.actionsBox.style ="spacing: 10px; margin-right: 10px; padding-right: 0.4em;";
+        this.actionsBox.style ="spacing: 6px; margin-right: 10px; padding-right: 0.4em;";
         this.mainBox.add(this.actionsBox);
 
         let userAvatarSize = 32;
@@ -60,14 +60,22 @@ var createMenu = class extends BaseMenuLayout.BaseLayout{
         let settingsButton = new MW.SettingsButton(this);
         this.actionsBox.add(settingsButton.actor);
 
-        let userButton = new MW.UserButton(this);
-        this.actionsBox.add(userButton.actor);
-
-        let lock = new MW.LockButton(this);
-        this.actionsBox.add(lock.actor);
-
-        let logout = new MW.LogoutButton(this);
-        this.actionsBox.add(logout.actor);
+        if(this._settings.get_boolean('show-logout-button')){
+            let logout = new MW.LogoutButton( this);
+            this.actionsBox.add(logout.actor);
+        }  
+        if(this._settings.get_boolean('show-lock-button')){
+            let lock = new MW.LockButton( this);
+            this.actionsBox.add(lock.actor);
+        }
+        if(this._settings.get_boolean('show-suspend-button')){
+            let suspend = new MW.SuspendButton( this);
+            this.actionsBox.add(suspend.actor);
+        }
+        if(this._settings.get_boolean('show-power-button')){
+            let power = new MW.PowerButton( this);
+            this.actionsBox.add(power.actor);
+        }
 
         this.searchBox = new MW.SearchBox(this);
         this._searchBoxChangedId = this.searchBox.connect('changed', this._onSearchBoxChanged.bind(this));