brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

theme: Adjust the aggregate menu

Browse Source 
Adjust spacing and size of elements and other to correspond better
to the mockups.
This commit is contained in:
Jasper St. Pierre 2013-07-16 16:26:39 -04:00
parent 16b2169965
commit 8e49c433e8
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/theme/gnome-shell.css
View File

@ -133,7 +133,7 @@ StScrollBar StButton#vhandle:active {
-slider-active-background-color: #76b0ec; -slider-active-background-color: #76b0ec;
-slider-active-border-color: #1f6dbc; -slider-active-border-color: #1f6dbc;
-slider-border-width: 1px; -slider-border-width: 1px;
-slider-handle-radius: 0.5em; -slider-handle-radius: 6px;
} }
/* PopupMenu */ /* PopupMenu */
@ -157,6 +157,10 @@ StScrollBar StButton#vhandle:active {
min-width: 200px; min-width: 200px;
} }
.popup-submenu-menu-item-triangle {
font-size: 120%;
}
.popup-submenu-menu-item:open { .popup-submenu-menu-item:open {
background-color: #4c4c4c; background-color: #4c4c4c;
} }
@ -197,7 +201,7 @@ StScrollBar StButton#vhandle:active {
} }
.popup-menu-item { .popup-menu-item {
spacing: 1em; spacing: 12px;
} }
.popup-menu-item:ltr { .popup-menu-item:ltr {
@ -633,7 +637,7 @@ StScrollBar StButton#vhandle:active {
} }
.aggregate-menu { .aggregate-menu {
width: 320px; width: 340px;
} }
.aggregate-menu .popup-menu-icon { .aggregate-menu .popup-menu-icon {

12
js/ui/popupMenu.js
View File

@ -870,8 +870,6 @@ const PopupSubMenu = new Lang.Class({
this.parent(sourceActor); this.parent(sourceActor);
this._arrow = sourceArrow; 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 // 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 // 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.status = new St.Label({ style_class: 'popup-status-menu-item' });
this.actor.add_child(this.status); this.actor.add_child(this.status);
this._triangle = new St.Label({ text: '\u25B8' }); this._triangle = new St.Label({ text: '\u25B8',
this.actor.add_child(this._triangle); 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 = new PopupSubMenu(this.actor, this._triangle);
this.menu.connect('open-state-changed', Lang.bind(this, this._subMenuOpenStateChanged)); this.menu.connect('open-state-changed', Lang.bind(this, this._subMenuOpenStateChanged));