[gnome-shell] ui: Don't use Clutter.Group
- From: Adel Gadllah <agadllah src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] ui: Don't use Clutter.Group
- Date: Fri, 22 Feb 2013 13:29:06 +0000 (UTC)
commit 627a2412d22650e54e55f4bc528d027bd7cb7c44
Author: Adel Gadllah <adel gadllah gmail com>
Date: Fri Feb 22 12:23:56 2013 +0100
ui: Don't use Clutter.Group
It is deprecated use Clutter.Actor instead.
https://bugzilla.gnome.org/show_bug.cgi?id=694441
js/ui/layout.js | 4 ++--
js/ui/modalDialog.js | 2 +-
js/ui/panel.js | 2 +-
js/ui/windowManager.js | 6 +++---
js/ui/workspace.js | 8 ++++----
js/ui/workspaceThumbnail.js | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/js/ui/layout.js b/js/ui/layout.js
index d419215..2b96df8 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -1075,7 +1075,7 @@ const HotCorner = new Lang.Class({
// multiple times due to an accidental jitter.
this._entered = false;
- this.actor = new Clutter.Group({ name: 'hot-corner-environs',
+ this.actor = new Clutter.Actor({ name: 'hot-corner-environs',
width: 3,
height: 3,
reactive: true });
@@ -1087,7 +1087,7 @@ const HotCorner = new Lang.Class({
reactive: true });
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) {
this._corner.set_position(this.actor.width - this._corner.width, 0);
diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 4649d6d..5c20b08 100644
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -80,7 +80,7 @@ const ModalDialog = new Lang.Class({
let stack = new Shell.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.dialogLayout);
} else {
diff --git a/js/ui/panel.js b/js/ui/panel.js
index f24f3a4..558ce67 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -203,7 +203,7 @@ const TextShadower = new Lang.Class({
let child = children[i];
let childBox = new Clutter.ActorBox();
// 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
switch (i) {
case 0: // top
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 8b8870e..7c1ff09 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -564,9 +564,9 @@ const WindowManager = new Lang.Class({
let switchData = {};
this._switchData = switchData;
- switchData.inGroup = new Clutter.Group();
- switchData.outGroup = new Clutter.Group();
- switchData.movingWindowBin = new Clutter.Group();
+ switchData.inGroup = new Clutter.Actor();
+ switchData.outGroup = new Clutter.Actor();
+ switchData.movingWindowBin = new Clutter.Actor();
switchData.windows = [];
let wgroup = global.window_group;
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index bf951d0..b6c0d22 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -68,15 +68,15 @@ const WindowClone = new Lang.Class({
// The MetaShapedTexture that we clone has a size that includes
// 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.
- this.actor = new Clutter.Group({ reactive: true,
+ this.actor = new Clutter.Actor({ reactive: true,
x: this.origX,
y: this.origY,
width: outerRect.width,
height: outerRect.height });
- this.actor.add_actor(this._windowClone);
+ this.actor.add_child(this._windowClone);
this.actor._delegate = this;
@@ -814,7 +814,7 @@ const Workspace = new Lang.Class({
this.monitorIndex = 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.
this._windowOverlaysGroup.set_size(0, 0);
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index dee24fa..aaf2015 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -166,8 +166,8 @@ const WorkspaceThumbnail = new Lang.Class({
style_class: 'workspace-thumbnail' });
this.actor._delegate = this;
- this._contents = new Clutter.Group();
- this.actor.add_actor(this._contents);
+ this._contents = new Clutter.Actor();
+ this.actor.add_child(this._contents);
this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]