[gnome-shell/wip/fmuellner/notification-redux+sass: 21/122] layout: Add back affectsInputRegion
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/fmuellner/notification-redux+sass: 21/122] layout: Add back affectsInputRegion
- Date: Tue, 17 Feb 2015 15:05:44 +0000 (UTC)
commit b863245a301003f36efac0fa171828c83b7e5f2e
Author: Florian Müllner <fmuellner gnome org>
Date: Mon Feb 9 09:25:00 2015 +0100
layout: Add back affectsInputRegion
It was removed as actors that should not affect the input
region can simply be added to the uiGroup instead. However
the property is useful
This reverts commit e62d22a50ed8aa25de988fb3c389b999e42f2eac.
js/ui/layout.js | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/js/ui/layout.js b/js/ui/layout.js
index 0ff8dfc..e80010c 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -170,6 +170,7 @@ const Monitor = new Lang.Class({
const defaultParams = {
trackFullscreen: false,
affectsStruts: false,
+ affectsInputRegion: true
};
const LayoutManager = new Lang.Class({
@@ -783,10 +784,11 @@ const LayoutManager = new Lang.Class({
// @actor: an actor to add to the chrome
// @params: (optional) additional params
//
- // Adds @actor to the chrome, and extends the input region
- // to include it. Changes in @actor's size, position, and
- // visibility will automatically result in appropriate changes
- // to the input region.
+ // Adds @actor to the chrome, and (unless %affectsInputRegion in
+ // @params is %false) extends the input region to include it.
+ // Changes in @actor's size, position, and visibility will
+ // automatically result in appropriate changes to the input
+ // region.
//
// If %affectsStruts in @params is %true (and @actor is along a
// screen edge), then @actor's size and position will also affect
@@ -988,7 +990,7 @@ const LayoutManager = new Lang.Class({
for (i = 0; i < this._trackedActors.length; i++) {
let actorData = this._trackedActors[i];
- if (!wantsInputRegion && !actorData.affectsStruts)
+ if (!(actorData.affectsInputRegion && wantsInputRegion) && !actorData.affectsStruts)
continue;
let [x, y] = actorData.actor.get_transformed_position();
@@ -998,7 +1000,7 @@ const LayoutManager = new Lang.Class({
w = Math.round(w);
h = Math.round(h);
- if (wantsInputRegion && actorData.actor.get_paint_visibility())
+ if (actorData.affectsInputRegion && wantsInputRegion && actorData.actor.get_paint_visibility())
rects.push(new Meta.Rectangle({ x: x, y: y, width: w, height: h }));
if (actorData.affectsStruts) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]