r33900 - in /desktop/unstable/gnome-sushi/debian: changelog patches/03-revert-main-window-use-a-ClutterBoxLayout.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sun Apr 1 03:52:21 UTC 2012
Author: biebl
Date: Sun Apr 1 03:52:20 2012
New Revision: 33900
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33900
Log:
Revert clutter-related upstream commit which doesn't work with the current
version of clutter in unstable.
Added:
desktop/unstable/gnome-sushi/debian/patches/03-revert-main-window-use-a-ClutterBoxLayout.patch
Modified:
desktop/unstable/gnome-sushi/debian/changelog
desktop/unstable/gnome-sushi/debian/patches/series
Modified: desktop/unstable/gnome-sushi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/changelog?rev=33900&op=diff
==============================================================================
--- desktop/unstable/gnome-sushi/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-sushi/debian/changelog [utf-8] Sun Apr 1 03:52:20 2012
@@ -6,8 +6,10 @@
* Drop all binary packages besides gnome-sushi.
* Add the necessary Breaks/Replaces for proper upgrades.
* Use dh-autoreconf to update the build system.
+ * Revert clutter-related upstream commit which doesn't work with the current
+ version of clutter in unstable.
- -- Michael Biebl <biebl at debian.org> Sun, 01 Apr 2012 05:37:48 +0200
+ -- Michael Biebl <biebl at debian.org> Sun, 01 Apr 2012 05:50:53 +0200
gnome-sushi (0.3.92-1) experimental; urgency=low
Added: desktop/unstable/gnome-sushi/debian/patches/03-revert-main-window-use-a-ClutterBoxLayout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/patches/03-revert-main-window-use-a-ClutterBoxLayout.patch?rev=33900&op=file
==============================================================================
--- desktop/unstable/gnome-sushi/debian/patches/03-revert-main-window-use-a-ClutterBoxLayout.patch (added)
+++ desktop/unstable/gnome-sushi/debian/patches/03-revert-main-window-use-a-ClutterBoxLayout.patch [utf-8] Sun Apr 1 03:52:20 2012
@@ -1,0 +1,105 @@
+From 5e96f1efe5b3655768c684e8ec91bf17b937c1d8 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Sun, 1 Apr 2012 04:43:56 +0200
+Subject: [PATCH] Revert "main-window: use a ClutterBoxLayout for the title
+ actor"
+
+This reverts commit 6603f5b68f69825f8a65c4d3ec3a4d027265aaee.
+---
+ src/js/ui/mainWindow.js | 56 ++++++++++++++++++++++++++++-------------------
+ 1 file changed, 33 insertions(+), 23 deletions(-)
+
+diff --git a/src/js/ui/mainWindow.js b/src/js/ui/mainWindow.js
+index 0ac109c..2a45f75 100644
+--- a/src/js/ui/mainWindow.js
++++ b/src/js/ui/mainWindow.js
+@@ -107,7 +107,12 @@ MainWindow.prototype = {
+ alpha: 255 }));
+ this._mainGroup = new Clutter.Group();
+ this._stage.add_actor(this._mainGroup);
++
++ this._titleGroup = new Clutter.Group();
++ this._stage.add_actor(this._titleGroup);
++
+ this._mainGroup.set_opacity(0);
++ this._titleGroup.set_opacity(0);
+ },
+
+ _connectStageSignals : function() {
+@@ -555,27 +560,22 @@ MainWindow.prototype = {
+ ************************ titlebar helpers ********************************
+ **************************************************************************/
+ _createTitle : function() {
+- if (this._titleGroup) {
+- this._titleGroup.raise_top();
++ if (this._titleLabel) {
++ this._titleActor.raise_top();
++ this._quitActor.raise_top();
+ return;
+ }
+
+- this._titleGroupLayout = new Clutter.BoxLayout();
+- this._titleGroup = new Clutter.Box({ layout_manager: this._titleGroupLayout,
+- opacity: 0 });
+- this._stage.add_actor(this._titleGroup);
+-
+- this._titleGroup.add_constraint(
+- new Clutter.BindConstraint({ source: this._stage,
+- coordinate: Clutter.BindCoordinate.WIDTH }));
+-
+ this._titleLabel = new Gtk.Label({ label: "",
+- ellipsize: Pango.EllipsizeMode.END,
+- margin: 6 });
++ ellipsize: Pango.EllipsizeMode.END });
+ this._titleLabel.get_style_context().add_class("np-decoration");
+
+ this._titleLabel.show();
+ this._titleActor = new GtkClutter.Actor({ contents: this._titleLabel });
++ this._titleActor.add_constraint(
++ new Clutter.AlignConstraint({ source: this._stage,
++ align_axis: Clutter.AlignAxis.X_AXIS,
++ factor: 0.5 }));
+
+ this._quitButton =
+ new Gtk.Button({ image: new Gtk.Image ({ "icon-size": Gtk.IconSize.MENU,
+@@ -589,17 +589,27 @@ MainWindow.prototype = {
+
+ this._quitActor = new GtkClutter.Actor({ contents: this._quitButton });
+ this._quitActor.set_reactive(true);
++ this._quitActor.add_constraint(
++ new Clutter.AlignConstraint({ source: this._stage,
++ factor: 1.0 }));
++
++ this._titleActor.add_constraint(
++ new Clutter.SnapConstraint({ source: this._stage,
++ from_edge: Clutter.SnapEdge.LEFT,
++ to_edge: Clutter.SnapEdge.LEFT,
++ offset: 6 }));
++ this._titleActor.add_constraint(
++ new Clutter.SnapConstraint({ source: this._quitActor,
++ from_edge: Clutter.SnapEdge.RIGHT,
++ to_edge: Clutter.SnapEdge.LEFT,
++ offset: -6 }));
++ this._titleActor.add_constraint(
++ new Clutter.BindConstraint({ source: this._stage,
++ coordinate: Clutter.BindCoordinate.Y,
++ offset: 6 }));
+
+- let hidden = new Clutter.Actor();
+- let size = this._quitButton.get_preferred_size()[1];
+- hidden.set_size(size.width, size.height);
+-
+- this._titleGroupLayout.pack(hidden, false, false, false,
+- Clutter.BoxAlignment.START, Clutter.BoxAlignment.START);
+- this._titleGroupLayout.pack(this._titleActor, true, true, false,
+- Clutter.BoxAlignment.CENTER, Clutter.BoxAlignment.START);
+- this._titleGroupLayout.pack(this._quitActor, false, false, false,
+- Clutter.BoxAlignment.END, Clutter.BoxAlignment.START);
++ this._titleGroup.add_actor(this._titleActor);
++ this._titleGroup.add_actor(this._quitActor);
+ },
+
+ /**************************************************************************
+--
+1.7.9.5
+
Modified: desktop/unstable/gnome-sushi/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/patches/series?rev=33900&op=diff
==============================================================================
--- desktop/unstable/gnome-sushi/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-sushi/debian/patches/series [utf-8] Sun Apr 1 03:52:20 2012
@@ -1,2 +1,3 @@
01-privlib.patch
02-no-gettext.patch
+03-revert-main-window-use-a-ClutterBoxLayout.patch
More information about the pkg-gnome-commits
mailing list