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

layout: Remove affectsInputRegion

Browse Source 
This can easy be worked around by adding things to the uiGroup
instead, so there's really no reason to have it here still.

https://bugzilla.gnome.org/show_bug.cgi?id=700735
This commit is contained in:
Jasper St. Pierre 2013-05-18 20:59:46 -04:00
parent 402f2d939c
commit e62d22a50e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/ui/layout.js
View File

@ -137,7 +137,6 @@ const Monitor = new Lang.Class({
const defaultParams = { const defaultParams = {
trackFullscreen: false, trackFullscreen: false,
affectsStruts: false, affectsStruts: false,
affectsInputRegion: true
}; };
const LayoutManager = new Lang.Class({ const LayoutManager = new Lang.Class({
@ -732,11 +731,10 @@ const LayoutManager = new Lang.Class({
// @actor: an actor to add to the chrome // @actor: an actor to add to the chrome
// @params: (optional) additional params // @params: (optional) additional params
// //
// Adds @actor to the chrome, and (unless %affectsInputRegion in // Adds @actor to the chrome, and extends the input region
// @params is %false) extends the input region to include it. // to include it. Changes in @actor's size, position, and
// Changes in @actor's size, position, and visibility will // visibility will automatically result in appropriate changes
// automatically result in appropriate changes to the input // to the input region.
// region.
// //
// If %affectsStruts in @params is %true (and @actor is along a // If %affectsStruts in @params is %true (and @actor is along a
// screen edge), then @actor's size and position will also affect // screen edge), then @actor's size and position will also affect
@ -950,7 +948,7 @@ const LayoutManager = new Lang.Class({
for (i = 0; i < this._trackedActors.length; i++) { for (i = 0; i < this._trackedActors.length; i++) {
let actorData = this._trackedActors[i]; let actorData = this._trackedActors[i];
if (!(actorData.affectsInputRegion && wantsInputRegion) && !actorData.affectsStruts) if (!wantsInputRegion && !actorData.affectsStruts)
continue; continue;
let [x, y] = actorData.actor.get_transformed_position(); let [x, y] = actorData.actor.get_transformed_position();
@ -960,7 +958,7 @@ const LayoutManager = new Lang.Class({
w = Math.round(w); w = Math.round(w);
h = Math.round(h); h = Math.round(h);
if (actorData.affectsInputRegion && wantsInputRegion && actorData.actor.get_paint_visibility()) if (wantsInputRegion && actorData.actor.get_paint_visibility())
rects.push(new Meta.Rectangle({ x: x, y: y, width: w, height: h })); rects.push(new Meta.Rectangle({ x: x, y: y, width: w, height: h }));
if (actorData.affectsStruts) { if (actorData.affectsStruts) {

2
js/ui/osdWindow.js
View File

@ -107,7 +107,7 @@ const OsdWindow = new Lang.Class({
Lang.bind(this, this._monitorsChanged)); Lang.bind(this, this._monitorsChanged));
this._monitorsChanged(); this._monitorsChanged();
Main.layoutManager.addChrome(this.actor, { affectsInputRegion: false }); Main.uiGroup.add_child(this.actor);
}, },
setIcon: function(icon) { setIcon: function(icon) {