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

layout: Prevent going into negatives with the pressure

Browse Source 
We capped each event to 15px of travel, but we didn't do the same
cap when subtracting events that were too old.
This commit is contained in:
Jasper St. Pierre 2013-03-01 15:21:25 -05:00
parent 157d7e2b59
commit d4259fa8aa
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/ui/layout.js
View File

@ -1296,19 +1296,16 @@ const PressureBarrier = new Lang.Class({
return Math.abs(event.dy);
},
_isBarrierEventTooOld: function(event) {
// Ignore all events older than this time
let threshold = this._lastTime - this._timeout;
return event.time < threshold;
},
_trimBarrierEvents: function() {
// Events are guaranteed to be sorted in time order from
// oldest to newest, so just look for the first old event,
// and then chop events after that off.
let i = 0;
let threshold = this._lastTime - this._timeout;
while (i < this._barrierEvents.length) {
if (!this._isBarrierEventTooOld(this._barrierEvents[i]))
let [time, distance] = this._barrierEvents[i];
if (time >= threshold)
break;
i++;
}
@ -1316,7 +1313,8 @@ const PressureBarrier = new Lang.Class({
let firstNewEvent = i;
for (i = 0; i < firstNewEvent; i++) {
this._currentPressure -= this._getDistanceAcrossBarrier(this._barrierEvents[i]);
let [time, distance] = this._barrierEvents[i];
this._currentPressure -= distance;
}
this._barrierEvents = this._barrierEvents.slice(firstNewEvent);
@ -1362,8 +1360,10 @@ const PressureBarrier = new Lang.Class({
this._lastTime = event.time;
this._trimBarrierEvents();
this._barrierEvents.push(event);
this._currentPressure += Math.min(15, distance);
distance = Math.min(15, distance);
this._barrierEvents.push([event.time, distance]);
this._currentPressure += distance;
if (this._currentPressure >= this._threshold)
this._trigger();