[gnome-shell/wip/sass: 26/30] Revert "appDisplay: Show a dot when application is running"
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/sass: 26/30] Revert "appDisplay: Show a dot when application is running"
- Date: Mon, 27 Oct 2014 17:27:49 +0000 (UTC)
commit 151a612ce0575cc48df629fb747bcdf3af624f99
Author: Jakub Steiner <jimmac gmail com>
Date: Fri Oct 24 21:15:09 2014 +0200
Revert "appDisplay: Show a dot when application is running"
This reverts commit abcd96813df28378f6edd9f83b5b1f3e08e96457.
js/ui/appDisplay.js | 50 ++++++++++++++++----------------------------------
1 files changed, 16 insertions(+), 34 deletions(-)
---
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index c473159..1e94015 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1519,27 +1519,12 @@ const AppIcon = new Lang.Class({
this.id = app.get_id();
this.name = app.get_name();
- this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout(),
- x_expand:true, y_expand:true });
-
- this._dot = new St.Widget({ style_class: 'app-well-app-running-dot',
- layout_manager: new Clutter.BinLayout(),
- x_expand: true, y_expand: true,
- x_align: Clutter.ActorAlign.CENTER,
- y_align: Clutter.ActorAlign.END });
-
- this._dot.hide();
-
- this._button = new St.Button({ style_class: 'app-well-app',
- reactive: true,
- button_mask: St.ButtonMask.ONE | St.ButtonMask.TWO,
- can_focus: true,
- x_fill: true,
- y_fill: true });
-
- this.actor.add_actor(this._button);
- this.actor.add_actor(this._dot);
-
+ this.actor = new St.Button({ style_class: 'app-well-app',
+ reactive: true,
+ button_mask: St.ButtonMask.ONE | St.ButtonMask.TWO,
+ can_focus: true,
+ x_fill: true,
+ y_fill: true });
this.actor._delegate = this;
if (!iconParams)
@@ -1548,15 +1533,15 @@ const AppIcon = new Lang.Class({
iconParams['createIcon'] = Lang.bind(this, this._createIcon);
iconParams['setSizeManually'] = true;
this.icon = new IconGrid.BaseIcon(app.get_name(), iconParams);
- this._button.set_child(this.icon.actor);
+ this.actor.set_child(this.icon.actor);
- this._button.label_actor = this.icon.label;
+ this.actor.label_actor = this.icon.label;
- this._button.connect('leave-event', Lang.bind(this, this._onLeaveEvent));
- this._button.connect('button-press-event', Lang.bind(this, this._onButtonPress));
- this._button.connect('touch-event', Lang.bind(this, this._onTouchEvent));
- this._button.connect('clicked', Lang.bind(this, this._onClicked));
- this._button.connect('popup-menu', Lang.bind(this, this._onKeyboardPopupMenu));
+ this.actor.connect('leave-event', Lang.bind(this, this._onLeaveEvent));
+ this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
+ this.actor.connect('touch-event', Lang.bind(this, this._onTouchEvent));
+ this.actor.connect('clicked', Lang.bind(this, this._onClicked));
+ this.actor.connect('popup-menu', Lang.bind(this, this._onKeyboardPopupMenu));
this._menu = null;
this._menuManager = new PopupMenu.PopupMenuManager(this);
@@ -1604,13 +1589,10 @@ const AppIcon = new Lang.Class({
},
_onStateChanged: function() {
- if (this.app.state != Shell.AppState.STOPPED) {
+ if (this.app.state != Shell.AppState.STOPPED)
this.actor.add_style_class_name('running');
- this._dot.show();
- } else {
+ else
this.actor.remove_style_class_name('running');
- this._dot.hide();
- }
},
_setPopupTimeout: function() {
@@ -1625,7 +1607,7 @@ const AppIcon = new Lang.Class({
},
_onLeaveEvent: function(actor, event) {
- this._button.fake_release();
+ this.actor.fake_release();
this._removeMenuTimeout();
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]