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

ui: Don't use Clutter.Group

Browse Source 
It is deprecated use Clutter.Actor instead.

https://bugzilla.gnome.org/show_bug.cgi?id=694441
This commit is contained in:
Adel Gadllah 2013-02-22 12:23:56 +01:00
parent acffd1e792
commit 627a2412d2
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/ui/layout.js
View File

@ -1075,7 +1075,7 @@ const HotCorner = new Lang.Class({
// multiple times due to an accidental jitter. // multiple times due to an accidental jitter.
this._entered = false; this._entered = false;
this.actor = new Clutter.Group({ name: 'hot-corner-environs', this.actor = new Clutter.Actor({ name: 'hot-corner-environs',
width: 3, width: 3,
height: 3, height: 3,
reactive: true }); reactive: true });
@ -1087,7 +1087,7 @@ const HotCorner = new Lang.Class({
reactive: true }); reactive: true });
this._corner._delegate = this; this._corner._delegate = this;
this.actor.add_actor(this._corner); this.actor.add_child(this._corner);
if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) { if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) {
this._corner.set_position(this.actor.width - this._corner.width, 0); this._corner.set_position(this.actor.width - this._corner.width, 0);

2
js/ui/modalDialog.js
View File

@ -80,7 +80,7 @@ const ModalDialog = new Lang.Class({
let stack = new Shell.Stack(); let stack = new Shell.Stack();
this._backgroundBin.child = stack; this._backgroundBin.child = stack;
this._eventBlocker = new Clutter.Group({ reactive: true }); this._eventBlocker = new Clutter.Actor({ reactive: true });
stack.add_actor(this._eventBlocker); stack.add_actor(this._eventBlocker);
stack.add_actor(this.dialogLayout); stack.add_actor(this.dialogLayout);
} else { } else {

2
js/ui/panel.js
View File

@ -203,7 +203,7 @@ const TextShadower = new Lang.Class({
let child = children[i]; let child = children[i];
let childBox = new Clutter.ActorBox(); let childBox = new Clutter.ActorBox();
// The order of the labels here is arbitrary, except // The order of the labels here is arbitrary, except
// we know the "real" label is at the end because Clutter.Group // we know the "real" label is at the end because Clutter.Actor
// sorts by Z order // sorts by Z order
switch (i) { switch (i) {
case 0: // top case 0: // top

6
js/ui/windowManager.js
View File

@ -564,9 +564,9 @@ const WindowManager = new Lang.Class({
let switchData = {}; let switchData = {};
this._switchData = switchData; this._switchData = switchData;
switchData.inGroup = new Clutter.Group(); switchData.inGroup = new Clutter.Actor();
switchData.outGroup = new Clutter.Group(); switchData.outGroup = new Clutter.Actor();
switchData.movingWindowBin = new Clutter.Group(); switchData.movingWindowBin = new Clutter.Actor();
switchData.windows = []; switchData.windows = [];
let wgroup = global.window_group; let wgroup = global.window_group;

8
js/ui/workspace.js
View File

@ -68,15 +68,15 @@ const WindowClone = new Lang.Class({
// The MetaShapedTexture that we clone has a size that includes // The MetaShapedTexture that we clone has a size that includes
// the invisible border; this is inconvenient; rather than trying // the invisible border; this is inconvenient; rather than trying
// to compensate all over the place we insert a ClutterGroup into // to compensate all over the place we insert a ClutterActor into
// the hierarchy that is sized to only the visible portion. // the hierarchy that is sized to only the visible portion.
this.actor = new Clutter.Group({ reactive: true, this.actor = new Clutter.Actor({ reactive: true,
x: this.origX, x: this.origX,
y: this.origY, y: this.origY,
width: outerRect.width, width: outerRect.width,
height: outerRect.height }); height: outerRect.height });
this.actor.add_actor(this._windowClone); this.actor.add_child(this._windowClone);
this.actor._delegate = this; this.actor._delegate = this;
@ -814,7 +814,7 @@ const Workspace = new Lang.Class({
this.monitorIndex = monitorIndex; this.monitorIndex = monitorIndex;
this._monitor = Main.layoutManager.monitors[this.monitorIndex]; this._monitor = Main.layoutManager.monitors[this.monitorIndex];
this._windowOverlaysGroup = new Clutter.Group(); this._windowOverlaysGroup = new Clutter.Actor();
// Without this the drop area will be overlapped. // Without this the drop area will be overlapped.
this._windowOverlaysGroup.set_size(0, 0); this._windowOverlaysGroup.set_size(0, 0);

4
js/ui/workspaceThumbnail.js
View File

@ -166,8 +166,8 @@ const WorkspaceThumbnail = new Lang.Class({
style_class: 'workspace-thumbnail' }); style_class: 'workspace-thumbnail' });
this.actor._delegate = this; this.actor._delegate = this;
this._contents = new Clutter.Group(); this._contents = new Clutter.Actor();
this.actor.add_actor(this._contents); this.actor.add_child(this._contents);
this.actor.connect('destroy', Lang.bind(this, this._onDestroy)); this.actor.connect('destroy', Lang.bind(this, this._onDestroy));