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

Overview: don't use the overlay_group

Browse Source 
It's a deprecated concept, and we want to have our own actor
that we can add to the chrome to handle the input region.

https://bugzilla.gnome.org/show_bug.cgi?id=700735
This commit is contained in:
Giovanni Campagna 2013-05-21 22:15:01 +02:00
parent 35c665156b
commit d0310bd745
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/ui/layout.js
View File

@ -190,7 +190,9 @@ const LayoutManager = new Lang.Class({
this.uiGroup.add_actor(global.window_group); this.uiGroup.add_actor(global.window_group);
global.stage.remove_actor(global.overlay_group); global.stage.remove_actor(global.overlay_group);
this.uiGroup.add_actor(global.overlay_group); this.overviewGroup = new St.Widget({ name: 'overviewGroup' });
this.uiGroup.add_actor(this.overviewGroup);
global.stage.add_child(this.uiGroup); global.stage.add_child(this.uiGroup);
this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup', this.screenShieldGroup = new St.Widget({ name: 'screenShieldGroup',

4
js/ui/messageTray.js
View File

@ -1658,7 +1658,7 @@ const MessageTray = new Lang.Class({
this.clearableCount = 0; this.clearableCount = 0;
this._lightbox = new Lightbox.Lightbox(global.overlay_group, this._lightbox = new Lightbox.Lightbox(Main.layoutManager.overviewGroup,
{ inhibitEvents: true, { inhibitEvents: true,
fadeInTime: ANIMATION_TIME, fadeInTime: ANIMATION_TIME,
fadeOutTime: ANIMATION_TIME, fadeOutTime: ANIMATION_TIME,
@ -2344,7 +2344,7 @@ const MessageTray = new Lang.Class({
if (this._desktopClone) if (this._desktopClone)
this._desktopClone.destroy(); this._desktopClone.destroy();
let cloneSource = Main.overview.visible ? global.overlay_group : global.window_group; let cloneSource = Main.overview.visible ? Main.layoutManager.overviewGroup : global.window_group;
this._desktopClone = new Clutter.Clone({ source: cloneSource, this._desktopClone = new Clutter.Clone({ source: cloneSource,
clip: new Clutter.Geometry(this._bottomMonitorGeometry) }); clip: new Clutter.Geometry(this._bottomMonitorGeometry) });
Main.uiGroup.insert_child_above(this._desktopClone, cloneSource); Main.uiGroup.insert_child_above(this._desktopClone, cloneSource);

6
js/ui/overview.js
View File

@ -115,7 +115,7 @@ const Overview = new Lang.Class({
let monitor = Main.layoutManager.primaryMonitor; let monitor = Main.layoutManager.primaryMonitor;
this._desktopFade = new St.Bin(); this._desktopFade = new St.Bin();
global.overlay_group.add_actor(this._desktopFade); Main.layoutManager.overviewGroup.add_child(this._desktopFade);
let layout = new Clutter.BinLayout(); let layout = new Clutter.BinLayout();
this._stack = new Clutter.Actor({ layout_manager: layout }); this._stack = new Clutter.Actor({ layout_manager: layout });
@ -132,7 +132,7 @@ const Overview = new Lang.Class({
this._overview._delegate = this; this._overview._delegate = this;
this._backgroundGroup = new Meta.BackgroundGroup(); this._backgroundGroup = new Meta.BackgroundGroup();
global.overlay_group.add_child(this._backgroundGroup); Main.layoutManager.overviewGroup.add_child(this._backgroundGroup);
this._backgroundGroup.hide(); this._backgroundGroup.hide();
this._bgManagers = []; this._bgManagers = [];
@ -154,7 +154,7 @@ const Overview = new Lang.Class({
this._stack.hide(); this._stack.hide();
this._stack.add_actor(this._overview); this._stack.add_actor(this._overview);
global.overlay_group.add_actor(this._stack); Main.layoutManager.overviewGroup.add_child(this._stack);
this._coverPane.hide(); this._coverPane.hide();

6
js/ui/workspacesView.js
View File

@ -137,7 +137,7 @@ const WorkspacesView = new Lang.Class({
let ws = new Workspace.Workspace(null, i); let ws = new Workspace.Workspace(null, i);
ws.setFullGeometry(monitors[i]); ws.setFullGeometry(monitors[i]);
ws.setActualGeometry(monitors[i]); ws.setActualGeometry(monitors[i]);
global.overlay_group.add_actor(ws.actor); Main.layoutManager.overviewGroup.add_actor(ws.actor);
this._extraWorkspaces.push(ws); this._extraWorkspaces.push(ws);
} }
}, },
@ -594,7 +594,7 @@ const WorkspacesDisplay = new Lang.Class({
this._updateWorkspacesActualGeometry(); this._updateWorkspacesActualGeometry();
for (let i = 0; i < this._workspacesViews.length; i++) for (let i = 0; i < this._workspacesViews.length; i++)
global.overlay_group.add_actor(this._workspacesViews[i].actor); Main.layoutManager.overviewGroup.add_actor(this._workspacesViews[i].actor);
}, },
_scrollValueChanged: function() { _scrollValueChanged: function() {
@ -638,7 +638,7 @@ const WorkspacesDisplay = new Lang.Class({
// This is kinda hackish - we want the primary view to // This is kinda hackish - we want the primary view to
// appear as parent of this.actor, though in reality it // appear as parent of this.actor, though in reality it
// is added directly to overlay_group // is added directly to Main.layoutManager.overviewGroup
this._notifyOpacityId = newParent.connect('notify::opacity', this._notifyOpacityId = newParent.connect('notify::opacity',
Lang.bind(this, function() { Lang.bind(this, function() {
let opacity = this.actor.get_parent().opacity; let opacity = this.actor.get_parent().opacity;