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

endSessionDialog: Remove the interactivity of the end session dialog

Browse Source 
This was always sort of a hidden feature, and with the new designs
it's going to get unclear about what's clickable, and what's not.

https://bugzilla.gnome.org/show_bug.cgi?id=706612
This commit is contained in:
Jasper St. Pierre 2013-08-22 14:28:13 -04:00
parent d3a88e59b9
commit e4d46aee97
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1934,10 +1934,6 @@ StScrollBar StButton#vhandle:active {
color: #ccc; color: #ccc;
} }
.end-session-dialog-app-list-item:hover {
color: white;
}
.end-session-dialog-app-list-item:ltr { .end-session-dialog-app-list-item:ltr {
padding-right: 1em; padding-right: 1em;
} }

24
js/ui/endSessionDialog.js
View File

@ -20,7 +20,6 @@
const Lang = imports.lang; const Lang = imports.lang;
const Mainloop = imports.mainloop; const Mainloop = imports.mainloop;
const Signals = imports.signals;
const AccountsService = imports.gi.AccountsService; const AccountsService = imports.gi.AccountsService;
const Clutter = imports.gi.Clutter; const Clutter = imports.gi.Clutter;
@ -146,12 +145,11 @@ const ListItem = new Lang.Class({
let layout = new St.BoxLayout({ vertical: false}); let layout = new St.BoxLayout({ vertical: false});
this.actor = new St.Button({ style_class: 'end-session-dialog-app-list-item', this.actor = new St.Bin({ style_class: 'end-session-dialog-app-list-item',
can_focus: true, can_focus: true,
child: layout, child: layout,
reactive: true, x_align: St.Align.START,
x_align: St.Align.START, x_fill: true });
x_fill: true });
this._icon = this._app.create_icon_texture(_ITEM_ICON_SIZE); this._icon = this._app.create_icon_texture(_ITEM_ICON_SIZE);
@ -175,16 +173,8 @@ const ListItem = new Lang.Class({
textLayout.add(this._descriptionLabel, textLayout.add(this._descriptionLabel,
{ expand: true, { expand: true,
x_fill: true }); x_fill: true });
this.actor.connect('clicked', Lang.bind(this, this._onClicked));
}, },
_onClicked: function() {
this.emit('activate');
this._app.activate();
}
}); });
Signals.addSignalMethods(ListItem.prototype);
// The logout timer only shows updates every 10 seconds // The logout timer only shows updates every 10 seconds
// until the last 10 seconds, then it shows updates every // until the last 10 seconds, then it shows updates every
@ -469,10 +459,6 @@ const EndSessionDialog = new Lang.Class({
if (app) { if (app) {
let [reason] = inhibitor.GetReasonSync(); let [reason] = inhibitor.GetReasonSync();
let item = new ListItem(app, reason); let item = new ListItem(app, reason);
item.connect('activate',
Lang.bind(this, function() {
this.close();
}));
this._applicationList.add(item.actor, { x_fill: true }); this._applicationList.add(item.actor, { x_fill: true });
this._stopTimer(); this._stopTimer();
} else { } else {