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

layout: Allow multiple barriers to contribute to a PressureBarrier

Browse Source 
For the HotCorner case, we want to have to barriers both contribute
to the hot corner pressure, so we can't simply wrap the pressure
barrier.
This commit is contained in:
Jasper St. Pierre 2013-03-01 14:57:38 -05:00
parent 337d2da38a
commit 194574bb0e
1 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
js/ui/layout.js
View File

@ -191,6 +191,7 @@ const LayoutManager = new Lang.Class({
this.trayBox = new St.Widget({ name: 'trayBox', this.trayBox = new St.Widget({ name: 'trayBox',
layout_manager: new Clutter.BinLayout() }); layout_manager: new Clutter.BinLayout() });
this.addChrome(this.trayBox); this.addChrome(this.trayBox);
this._setupTrayPressure();
this.keyboardBox = new St.BoxLayout({ name: 'keyboardBox', this.keyboardBox = new St.BoxLayout({ name: 'keyboardBox',
reactive: true, reactive: true,
@ -423,26 +424,8 @@ const LayoutManager = new Lang.Class({
} }
}, },
_updateTrayBarrier: function() { _setupTrayPressure: function() {
let monitor = this.bottomMonitor; this._trayPressure = new PressureBarrier(MESSAGE_TRAY_PRESSURE_THRESHOLD,
if (this._trayBarrier) {
this._trayBarrier.destroy();
this._trayBarrier = null;
}
if (this._trayPressure) {
this._trayPressure.destroy();
this._trayPressure = null;
}
this._trayBarrier = new Meta.Barrier({ display: global.display,
x1: monitor.x, x2: monitor.x + monitor.width,
y1: monitor.y + monitor.height, y2: monitor.y + monitor.height,
directions: Meta.BarrierDirection.NEGATIVE_Y });
this._trayPressure = new PressureBarrier(this._trayBarrier,
MESSAGE_TRAY_PRESSURE_THRESHOLD,
MESSAGE_TRAY_PRESSURE_TIMEOUT, MESSAGE_TRAY_PRESSURE_TIMEOUT,
Shell.KeyBindingMode.NORMAL | Shell.KeyBindingMode.NORMAL |
Shell.KeyBindingMode.OVERVIEW); Shell.KeyBindingMode.OVERVIEW);
@ -452,6 +435,22 @@ const LayoutManager = new Lang.Class({
}); });
}, },
_updateTrayBarrier: function() {
let monitor = this.bottomMonitor;
if (this._trayBarrier) {
this._trayPressure.removeBarrier(this._trayBarrier);
this._trayBarrier.destroy();
this._trayBarrier = null;
}
this._trayBarrier = new Meta.Barrier({ display: global.display,
x1: monitor.x, x2: monitor.x + monitor.width,
y1: monitor.y + monitor.height, y2: monitor.y + monitor.height,
directions: Meta.BarrierDirection.NEGATIVE_Y });
this._trayPressure.addBarrier(this._trayBarrier);
},
_trayBarrierEventFilter: function(event) { _trayBarrierEventFilter: function(event) {
// Throw out all events where the pointer was grabbed by another // Throw out all events where the pointer was grabbed by another
// client, as the client that grabbed the pointer expects to have // client, as the client that grabbed the pointer expects to have
@ -1273,25 +1272,37 @@ const HotCorner = new Lang.Class({
const PressureBarrier = new Lang.Class({ const PressureBarrier = new Lang.Class({
Name: 'PressureBarrier', Name: 'PressureBarrier',
_init: function(barrier, threshold, timeout, keybindingMode) { _init: function(threshold, timeout, keybindingMode) {
this._barrier = barrier;
this._threshold = threshold; this._threshold = threshold;
this._timeout = timeout; this._timeout = timeout;
this._keybindingMode = keybindingMode; this._keybindingMode = keybindingMode;
this._orientation = (barrier.y1 == barrier.y2) ? Clutter.Orientation.HORIZONTAL : Clutter.Orientation.VERTICAL; this._barriers = [];
this._eventFilter = null; this._eventFilter = null;
this._isTriggered = false; this._isTriggered = false;
this._reset(); this._reset();
},
this._barrierHitId = this._barrier.connect('hit', Lang.bind(this, this._onBarrierHit)); addBarrier: function(barrier) {
this._barrierLeftId = this._barrier.connect('left', Lang.bind(this, this._onBarrierLeft)); barrier._pressureHitId = barrier.connect('hit', Lang.bind(this, this._onBarrierHit));
barrier._pressureLeftId = barrier.connect('left', Lang.bind(this, this._onBarrierLeft));
this._barriers.push(barrier);
},
_disconnectBarrier: function(barrier) {
barrier.disconnect(barrier._pressureHitId);
barrier.disconnect(barrier._pressureLeftId);
},
removeBarrier: function(barrier) {
this._disconnectBarrier(barrier);
this._barriers.splice(this._barriers.indexOf(barrier), 1);
}, },
destroy: function() { destroy: function() {
this._barrier.disconnect(this._barrierHitId); this._barriers.forEach(Lang.bind(this, this._disconnectBarrier));
this._barrier.disconnect(this._barrierLeftId); this._barriers = [];
this._barrier = null;
}, },
setEventFilter: function(filter) { setEventFilter: function(filter) {
@ -1304,15 +1315,19 @@ const PressureBarrier = new Lang.Class({
this._lastTime = 0; this._lastTime = 0;
}, },
_getDistanceAcrossBarrier: function(event) { _isHorizontal: function(barrier) {
if (this._orientation == Clutter.Orientation.HORIZONTAL) return barrier.y1 == barrier.y2;
},
_getDistanceAcrossBarrier: function(barrier, event) {
if (this._isHorizontal(barrier))
return Math.abs(event.dy); return Math.abs(event.dy);
else else
return Math.abs(event.dx); return Math.abs(event.dx);
}, },
_getDistanceAlongBarrier: function(event) { _getDistanceAlongBarrier: function(barrier, event) {
if (this._orientation == Clutter.Orientation.HORIZONTAL) if (this._isHorizontal(barrier))
return Math.abs(event.dx); return Math.abs(event.dx);
else else
return Math.abs(event.dy); return Math.abs(event.dy);
@ -1366,8 +1381,8 @@ const PressureBarrier = new Lang.Class({
if (!(this._keybindingMode & Main.keybindingMode)) if (!(this._keybindingMode & Main.keybindingMode))
return; return;
let slide = this._getDistanceAlongBarrier(event); let slide = this._getDistanceAlongBarrier(barrier, event);
let distance = this._getDistanceAcrossBarrier(event); let distance = this._getDistanceAcrossBarrier(barrier, event);
if (distance >= this._threshold) { if (distance >= this._threshold) {
this._trigger(); this._trigger();