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

ScreenShield: place the lock screen contents only on the primary monitor

Browse Source 
Use the new monitor constraint to place the clock and notification
box on the primary monitor only. The background is still extended
to the whole screen.
Get rid of the LockDialogGroup hack, now that ClutterBinLayout
respects fixed position correctly.

https://bugzilla.gnome.org/show_bug.cgi?id=681743
This commit is contained in:
Giovanni Campagna 2012-08-14 15:39:17 +02:00
parent 1a65374e21
commit 2b30afa618
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/ui/layout.js
View File

@ -109,6 +109,7 @@ const LayoutManager = new Lang.Class({
this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup', this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup',
visible: false, visible: false,
clip_to_allocation: true, clip_to_allocation: true,
layout_manager: new Clutter.BinLayout(),
}); });
this.addChrome(this.screenShieldGroup); this.addChrome(this.screenShieldGroup);

33
js/ui/screenShield.js
View File

@ -9,6 +9,7 @@ const Signals = imports.signals;
const St = imports.gi.St; const St = imports.gi.St;
const GnomeSession = imports.misc.gnomeSession; const GnomeSession = imports.misc.gnomeSession;
const Layout = imports.ui.layout;
const Lightbox = imports.ui.lightbox; const Lightbox = imports.ui.lightbox;
const Main = imports.ui.main; const Main = imports.ui.main;
const MessageTray = imports.ui.messageTray; const MessageTray = imports.ui.messageTray;
@ -257,23 +258,6 @@ const NotificationsBox = new Lang.Class({
}, },
}); });
const LockDialogGroup = new Lang.Class({
Name: 'LockDialogGroup',
Extends: St.Widget,
_init: function(params) {
this.parent(params);
},
vfunc_get_preferred_height: function(forWidth) {
return [global.screen_height, global.screen_height];
},
vfunc_get_preferred_width: function(forHeight) {
return [global.screen_width, global.screen_width];
}
});
/** /**
* To test screen shield, make sure to kill gnome-screensaver. * To test screen shield, make sure to kill gnome-screensaver.
* *
@ -294,14 +278,18 @@ const ScreenShield = new Lang.Class({
y_expand: true, y_expand: true,
reactive: true, reactive: true,
can_focus: true, can_focus: true,
layout_manager: new Clutter.BinLayout(),
name: 'lockScreenGroup', name: 'lockScreenGroup',
}); });
this._lockScreenGroup.connect('key-release-event', this._lockScreenGroup.connect('key-release-event',
Lang.bind(this, this._onLockScreenKeyRelease)); Lang.bind(this, this._onLockScreenKeyRelease));
this._lockScreenContents = new St.Widget({ layout_manager: new Clutter.BinLayout(),
name: 'lockScreenContents' });
this._lockScreenContents.add_constraint(new Layout.MonitorConstraint({ primary: true }));
this._background = Meta.BackgroundActor.new_for_screen(global.screen); this._background = Meta.BackgroundActor.new_for_screen(global.screen);
this._lockScreenGroup.add_actor(this._background); this._lockScreenGroup.add_actor(this._background);
this._lockScreenGroup.add_actor(this._lockScreenContents);
// FIXME: build the rest of the lock screen here // FIXME: build the rest of the lock screen here
@ -315,14 +303,17 @@ const ScreenShield = new Lang.Class({
y_expand: true y_expand: true
}); });
this._arrow.connect('repaint', Lang.bind(this, this._drawArrow)); this._arrow.connect('repaint', Lang.bind(this, this._drawArrow));
this._lockScreenGroup.add_actor(this._arrow); this._lockScreenContents.add_actor(this._arrow);
let action = new Clutter.DragAction({ drag_axis: Clutter.DragAxis.Y_AXIS }); let action = new Clutter.DragAction({ drag_axis: Clutter.DragAxis.Y_AXIS });
action.connect('drag-begin', Lang.bind(this, this._onDragBegin)); action.connect('drag-begin', Lang.bind(this, this._onDragBegin));
action.connect('drag-end', Lang.bind(this, this._onDragEnd)); action.connect('drag-end', Lang.bind(this, this._onDragEnd));
this._lockScreenGroup.add_action(action); this._lockScreenGroup.add_action(action);
this._lockDialogGroup = new LockDialogGroup({ name: 'lockDialogGroup' }); this._lockDialogGroup = new St.Widget({ x_expand: true,
y_expand: true,
name: 'lockDialogGroup' });
this.actor.add_actor(this._lockDialogGroup); this.actor.add_actor(this._lockDialogGroup);
this.actor.add_actor(this._lockScreenGroup); this.actor.add_actor(this._lockScreenGroup);
@ -545,7 +536,7 @@ const ScreenShield = new Lang.Class({
this._lockScreenContentsBox.add(this._clock.actor, { x_fill: true, this._lockScreenContentsBox.add(this._clock.actor, { x_fill: true,
y_fill: true }); y_fill: true });
this._lockScreenGroup.add_actor(this._lockScreenContentsBox); this._lockScreenContents.add_actor(this._lockScreenContentsBox);
if (this._settings.get_boolean('show-notifications')) { if (this._settings.get_boolean('show-notifications')) {
this._notificationsBox = new NotificationsBox(); this._notificationsBox = new NotificationsBox();