[gnome-shell/wip/aggregate-menu: 12/17] popupMenu: Remove custom allocation code
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/aggregate-menu: 12/17] popupMenu: Remove custom allocation code
- Date: Fri, 19 Jul 2013 10:08:18 +0000 (UTC)
commit 0610fc3db04ef36b2f11500d91dcf66c244862ff
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Jul 15 20:00:41 2013 -0400
popupMenu: Remove custom allocation code
With support for column-based layout gone, simply use a box layout
and allow items to use their own layouts without any "framework".
xxx: this breaks ornaments. figure out what to do with that.
HACKING | 4 +-
data/theme/gnome-shell.css | 2 +-
js/ui/dateMenu.js | 4 +-
js/ui/popupMenu.js | 170 ++++++--------------------------------------
js/ui/remoteMenu.js | 2 +-
js/ui/status/brightness.js | 5 +-
js/ui/status/keyboard.js | 4 +-
js/ui/status/system.js | 13 ++--
js/ui/status/volume.js | 6 +-
9 files changed, 39 insertions(+), 171 deletions(-)
---
diff --git a/HACKING b/HACKING
index fbdcdb6..b6ceaf1 100644
--- a/HACKING
+++ b/HACKING
@@ -138,8 +138,8 @@ GObjects, although this feature isn't used very often in the Shell itself.
_init: function(icon, label) {
this.parent({ reactive: false });
- this.addActor(icon);
- this.addActor(label);
+ this.actor.add_child(icon);
+ this.actor.add_child(label);
},
open: function() {
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 812502a..ce937b2 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -196,7 +196,7 @@ StScrollBar StButton#vhandle:active {
}
.popup-menu-item {
- padding: .4em 1.75em;
+ padding: .4em 1.75em .4em .4em;
spacing: 1em;
}
diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 85a0ade..e82c703 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -52,8 +52,8 @@ const DateMenuButton = new Lang.Class({
this._clockDisplay = new St.Label();
this.actor.add_actor(this._clockDisplay);
- hbox = new St.BoxLayout({name: 'calendarArea' });
- this.menu.addActor(hbox);
+ hbox = new St.BoxLayout({ name: 'calendarArea' });
+ this.menu.box.add_child(hbox);
// Fill up the first column
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index f435d5a..b06e050 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -45,23 +45,19 @@ const PopupBaseMenuItem = new Lang.Class({
style_class: null,
can_focus: true
});
- this.actor = new Shell.GenericContainer({ style_class: 'popup-menu-item',
- reactive: params.reactive,
- track_hover: params.reactive,
- can_focus: params.can_focus,
- accessible_role: Atk.Role.MENU_ITEM});
- this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
- this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
- this.actor.connect('allocate', Lang.bind(this, this._allocate));
- this.actor.connect('style-changed', Lang.bind(this, this._onStyleChanged));
+
+ this.actor = new St.BoxLayout({ style_class: 'popup-menu-item',
+ reactive: params.reactive,
+ track_hover: params.reactive,
+ can_focus: params.can_focus,
+ accessible_role: Atk.Role.MENU_ITEM });
this.actor._delegate = this;
- this._parent = null;
- this._children = [];
this._ornament = Ornament.NONE;
this._ornamentLabel = new St.Label({ style_class: 'popup-menu-ornament' });
- this.actor.add_actor(this._ornamentLabel);
- this._spacing = 0;
+ this.actor.add(this._ornamentLabel);
+
+ this._parent = null;
this.active = false;
this._activatable = params.reactive && params.activate;
this._sensitive = true;
@@ -94,10 +90,6 @@ const PopupBaseMenuItem = new Lang.Class({
this._parent = parent;
},
- _onStyleChanged: function (actor) {
- this._spacing = Math.round(actor.get_theme_node().get_length('spacing'));
- },
-
_onButtonReleaseEvent: function (actor, event) {
this.activate(event);
return true;
@@ -169,31 +161,6 @@ const PopupBaseMenuItem = new Lang.Class({
this.emit('destroy');
},
- // adds an actor to the menu item; @params can contain
- // %expand (defaults to #false), and %align (defaults to
- // #St.Align.START)
- addActor: function(child, params) {
- params = Params.parse(params, { expand: false, align: St.Align.START });
- params.actor = child;
- this._children.push(params);
- this.actor.connect('destroy', Lang.bind(this, function () { this._removeChild(child); }));
- this.actor.add_actor(child);
- },
-
- _removeChild: function(child) {
- for (let i = 0; i < this._children.length; i++) {
- if (this._children[i].actor == child) {
- this._children.splice(i, 1);
- return;
- }
- }
- },
-
- removeActor: function(child) {
- this.actor.remove_actor(child);
- this._removeChild(child);
- },
-
setOrnament: function(ornament) {
if (ornament == this._ornament)
return;
@@ -210,95 +177,6 @@ const PopupBaseMenuItem = new Lang.Class({
this._ornamentLabel.text = '';
this.actor.remove_accessible_state(Atk.StateType.CHECKED);
}
- },
-
- _getPreferredWidth: function(actor, forHeight, alloc) {
- let width = 0;
- for (let i = 0; i < this._children.length; i++) {
- let child = this._children[i];
- if (i > 0)
- width += this._spacing;
- let [min, natural] = child.actor.get_preferred_width(-1);
- width += natural;
- }
- alloc.min_size = alloc.natural_size = width;
- },
-
- _getPreferredHeight: function(actor, forWidth, alloc) {
- let height = 0, x = 0, minWidth, childWidth;
- for (let i = 0; i < this._children.length; i++) {
- let child = this._children[i];
- if (child.expand)
- childWidth = forWidth - x;
- else
- [minWidth, childWidth] = child.actor.get_preferred_width(-1);
- x += childWidth;
-
- let [min, natural] = child.actor.get_preferred_height(childWidth);
- if (natural > height)
- height = natural;
- }
- alloc.min_size = alloc.natural_size = height;
- },
-
- _allocate: function(actor, box, flags) {
- let width = box.x2 - box.x1;
- let height = box.y2 - box.y1;
- let direction = this.actor.get_text_direction();
-
- // The ornament is placed outside box
- // one quarter of padding from the border of the container
- // (so 3/4 from the inner border)
- // (padding is box.x1)
- let ornamentBox = new Clutter.ActorBox();
- let ornamentWidth = box.x1;
-
- ornamentBox.x1 = 0;
- ornamentBox.x2 = ornamentWidth;
- ornamentBox.y1 = box.y1;
- ornamentBox.y2 = box.y2;
-
- if (direction == Clutter.TextDirection.RTL) {
- ornamentBox.x1 += box.x2;
- ornamentBox.x2 += box.x2;
- }
-
- this._ornamentLabel.allocate(ornamentBox, flags);
-
- let x = box.x1;
- for (let i = 0, col = 0; i < this._children.length; i++) {
- let child = this._children[i];
- let childBox = new Clutter.ActorBox();
-
- let [minWidth, naturalWidth] = child.actor.get_preferred_width(-1);
-
- let availWidth;
- if (child.expand)
- availWidth = box.x2 - x;
- else
- availWidth = naturalWidth;
-
- if (direction == Clutter.TextDirection.RTL)
- childBox.x1 = width - x - availWidth;
- else
- childBox.x1 = x;
- childBox.x2 = childBox.x1 + availWidth;
-
- let [minHeight, naturalHeight] = child.actor.get_preferred_height(childBox.x2 - childBox.x1);
- childBox.y1 = Math.round(box.y1 + (height - naturalHeight) / 2);
- childBox.y2 = childBox.y1 + naturalHeight;
-
- let [xAlign, yAlign] = St.get_align_factors(child.align,
- St.Align.MIDDLE);
-
- // It's called "expand", but it's really more like "fill"
- let xFill = child.expand;
- child.actor.allocate_align_fill(childBox,
- xAlign, yAlign,
- xFill, true,
- flags);
- x += availWidth + this._spacing;
- }
}
});
Signals.addSignalMethods(PopupBaseMenuItem.prototype);
@@ -311,7 +189,7 @@ const PopupMenuItem = new Lang.Class({
this.parent(params);
this.label = new St.Label({ text: text });
- this.addActor(this.label);
+ this.actor.add_child(this.label);
this.actor.label_actor = this.label
}
});
@@ -324,15 +202,12 @@ const PopupSeparatorMenuItem = new Lang.Class({
this.parent({ reactive: false,
can_focus: false});
- this._box = new St.BoxLayout();
- this.addActor(this._box, { expand: true });
-
this.label = new St.Label({ text: text || '' });
- this._box.add(this.label);
+ this.actor.add(this.label);
this.actor.label_actor = this.label;
this._separator = new Separator.HorizontalSeparator({ style_class: 'popup-separator-menu-item' });
- this._box.add(this._separator.actor, { expand: true });
+ this.actor.add(this._separator.actor, { expand: true });
}
});
@@ -353,7 +228,7 @@ const PopupAlternatingMenuItem = new Lang.Class({
this._alternateText = alternateText;
this.label = new St.Label({ text: text });
this.state = PopupAlternatingMenuItemState.DEFAULT;
- this.addActor(this.label);
+ this.actor.add_child(this.label);
this.actor.label_actor = this.label;
this.actor.connect('notify::mapped', Lang.bind(this, this._onMapped));
@@ -478,10 +353,10 @@ const PopupSwitchMenuItem = new Lang.Class({
this.checkAccessibleState();
this.actor.label_actor = this.label;
- this.addActor(this.label);
+ this.actor.add_child(this.label);
this._statusBin = new St.Bin({ x_align: St.Align.END });
- this.addActor(this._statusBin, { expand: true, align: St.Align.END });
+ this.actor.add(this._statusBin, { expand: true, x_align: St.Align.END });
this._statusLabel = new St.Label({ text: '',
style_class: 'popup-status-menu-item'
@@ -824,10 +699,6 @@ const PopupMenuBase = new Lang.Class({
this.length++;
},
- addActor: function(actor) {
- this.box.add(actor);
- },
-
_getMenuItems: function() {
return this.box.get_children().map(function (actor) {
return actor._delegate;
@@ -1151,18 +1022,21 @@ const PopupSubMenuMenuItem = new Lang.Class({
if (wantIcon) {
this.icon = new St.Icon({ style_class: 'popup-menu-icon' });
- this.addActor(this.icon, { align: St.Align.MIDDLE });
+ this.actor.add_child(this.icon);
}
this.label = new St.Label({ text: text });
- this.addActor(this.label);
+ this.actor.add_child(this.label);
this.actor.label_actor = this.label;
+ let expander = new St.Bin({ style_class: 'popup-menu-item-expander' });
+ this.actor.add(expander, { expand: true });
+
this.status = new St.Label({ style_class: 'popup-status-menu-item' });
- this.addActor(this.status, { align: St.Align.END });
+ this.actor.add_child(this.status);
this._triangle = new St.Label({ text: '\u25B8' });
- this.addActor(this._triangle, { align: St.Align.END });
+ this.actor.add_child(this._triangle);
this.menu = new PopupSubMenu(this.actor, this._triangle);
this.menu.connect('open-state-changed', Lang.bind(this, this._subMenuOpenStateChanged));
diff --git a/js/ui/remoteMenu.js b/js/ui/remoteMenu.js
index cd3f36a..7d7ebbf 100644
--- a/js/ui/remoteMenu.js
+++ b/js/ui/remoteMenu.js
@@ -120,7 +120,7 @@ const RemoteMenuItemMapper = new Lang.Class({
this.menuItem = new PopupMenu.PopupBaseMenuItem();
this._label = new St.Label();
- this.menuItem.addActor(this._label);
+ this.menuItem.actor.add_child(this._label);
this.menuItem.actor.label_actor = this._label;
this.menuItem.connect('activate', Lang.bind(this, function() {
diff --git a/js/ui/status/brightness.js b/js/ui/status/brightness.js
index c784ad1..d5970f0 100644
--- a/js/ui/status/brightness.js
+++ b/js/ui/status/brightness.js
@@ -31,9 +31,8 @@ const BrightnessSlider = new Lang.Class({
let icon = new St.Icon({ icon_name: 'display-brightness-symbolic',
style_class: 'popup-menu-icon' });
- this.item.addActor(icon, { align: St.Align.MIDDLE });
- this.item.addActor(this._slider.actor, { expand: true });
-
+ this.item.actor.add(icon);
+ this.item.actor.add(this._slider.actor, { expand: true });
this.item.actor.connect('button-press-event', Lang.bind(this, function(actor, event) {
this._slider.startDragging(event);
}));
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index d65e774..eb54085 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -202,8 +202,8 @@ const LayoutMenuItem = new Lang.Class({
this.label = new St.Label({ text: displayName });
this.indicator = new St.Label({ text: shortName });
- this.addActor(this.label);
- this.addActor(this.indicator);
+ this.actor.add_child(this.label);
+ this.actor.add_child(this.indicator);
this.actor.label_actor = this.label;
}
});
diff --git a/js/ui/status/system.js b/js/ui/status/system.js
index 41156ad..3fbb206 100644
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -205,23 +205,20 @@ const Indicator = new Lang.Class({
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
- let hbox = new St.BoxLayout({ style_class: 'system-menu-actions-box' });
+ item = new PopupMenu.PopupBaseMenuItem({ reactive: false,
+ can_focus: false });
this._settingsAction = this._createActionButton('preferences-system-symbolic', _("Settings"));
this._settingsAction.connect('clicked', Lang.bind(this, this._onSettingsClicked));
- hbox.add(this._settingsAction, { expand: true, x_fill: false });
+ item.actor.add(this._settingsAction, { expand: true, x_fill: false });
this._lockScreenAction = this._createActionButton('changes-prevent-symbolic', _("Lock"));
this._lockScreenAction.connect('clicked', Lang.bind(this, this._onLockScreenClicked));
- hbox.add(this._lockScreenAction, { expand: true, x_fill: false });
+ item.actor.add(this._lockScreenAction, { expand: true, x_fill: false });
this._powerOffAction = this._createActionButton('system-shutdown-symbolic', _("Power Off"));
this._powerOffAction.connect('clicked', Lang.bind(this, this._onPowerOffClicked));
- hbox.add(this._powerOffAction, { expand: true, x_fill: false });
-
- item = new PopupMenu.PopupBaseMenuItem({ reactive: false,
- can_focus: false });
- item.addActor(hbox, { expand: true });
+ item.actor.add(this._powerOffAction, { expand: true, x_fill: false });
this.menu.addMenuItem(item);
},
diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index b461585..a6f2882 100644
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -39,10 +39,8 @@ const StreamSlider = new Lang.Class({
this._slider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
-
- this.item.addActor(this._icon, { align: St.Align.MIDDLE });
- this.item.addActor(this._slider.actor, { expand: true });
-
+ this.item.actor.add(this._icon);
+ this.item.actor.add(this._slider.actor, { expand: true });
this.item.actor.connect('button-press-event', Lang.bind(this, function(actor, event) {
this._slider.startDragging(event);
}));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
