From 8e49c433e89cef70e24c2783ba50b37a21465fcb Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 16 Jul 2013 16:26:39 -0400
Subject: [PATCH] theme: Adjust the aggregate menu

Adjust spacing and size of elements and other to correspond better
to the mockups.
---
 data/theme/gnome-shell.css | 10 +++++++---
 js/ui/popupMenu.js         | 12 ++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 8bf5d264e..87773079e 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -133,7 +133,7 @@ StScrollBar StButton#vhandle:active {
     -slider-active-background-color: #76b0ec;
     -slider-active-border-color: #1f6dbc;
     -slider-border-width: 1px;
-    -slider-handle-radius: 0.5em;
+    -slider-handle-radius: 6px;
 }
 
 /* PopupMenu */
@@ -157,6 +157,10 @@ StScrollBar StButton#vhandle:active {
     min-width: 200px;
 }
 
+.popup-submenu-menu-item-triangle {
+    font-size: 120%;
+}
+
 .popup-submenu-menu-item:open {
     background-color: #4c4c4c;
 }
@@ -197,7 +201,7 @@ StScrollBar StButton#vhandle:active {
 }
 
 .popup-menu-item {
-    spacing: 1em;
+    spacing: 12px;
 }
 
 .popup-menu-item:ltr {
@@ -633,7 +637,7 @@ StScrollBar StButton#vhandle:active {
 }
 
 .aggregate-menu {
-    width: 320px;
+    width: 340px;
 }
 
 .aggregate-menu .popup-menu-icon {
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index e99bee211..2ac169b4e 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -870,8 +870,6 @@ const PopupSubMenu = new Lang.Class({
         this.parent(sourceActor);
 
         this._arrow = sourceArrow;
-        this._arrow.pivot_point = new Clutter.Point({ x: 0.3,
-                                                      y: 0.5 });
 
         // Since a function of a submenu might be to provide a "More.." expander
         // with long content, we make it scrollable - the scrollbar will only take
@@ -1052,8 +1050,14 @@ const PopupSubMenuMenuItem = new Lang.Class({
         this.status = new St.Label({ style_class: 'popup-status-menu-item' });
         this.actor.add_child(this.status);
 
-        this._triangle = new St.Label({ text: '\u25B8' });
-        this.actor.add_child(this._triangle);
+        this._triangle = new St.Label({ text: '\u25B8',
+                                        style_class: 'popup-submenu-menu-item-triangle' });
+        this._triangle.pivot_point = new Clutter.Point({ x: 0.5, y: 0.6 });
+
+        this._triangleBin = new St.Widget({ y_expand: true,
+                                            y_align: Clutter.ActorAlign.CENTER });
+        this._triangleBin.add_child(this._triangle);
+        this.actor.add_child(this._triangleBin);
 
         this.menu = new PopupSubMenu(this.actor, this._triangle);
         this.menu.connect('open-state-changed', Lang.bind(this, this._subMenuOpenStateChanged));