rpms/clutter
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix a layout problem in gnome-boxes

Browse Source
This commit is contained in:
Matthias Clasen 2012-04-05 21:06:50 -04:00
parent 21f8e4f945
commit 835c2228ac
2 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
0001-table-layout-Fix-xy-_expand.patch Normal file
View File

@ -0,0 +1,54 @@
From cc515ab11cf91412cd99deac3e2945d7ed4e2dae Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 28 Mar 2012 08:34:36 +0100
Subject: [PATCH] table-layout: Fix [xy]_expand
A copy and paste thinko.
https://bugzilla.gnome.org/show_bug.cgi?id=672853
---
clutter/clutter-table-layout.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/clutter/clutter-table-layout.c b/clutter/clutter-table-layout.c
index ab7b5b2..fd216f3 100644
--- a/clutter/clutter-table-layout.c
+++ b/clutter/clutter-table-layout.c
@@ -861,7 +861,7 @@ calculate_col_widths (ClutterTableLayout *self,
}
if (!columns[i].expand)
- columns[i].expand = meta->x_fill;
+ columns[i].expand = meta->x_expand;
}
min_width += priv->col_spacing * (meta->col_span - 1);
pref_width += priv->col_spacing * (meta->col_span - 1);
@@ -915,8 +915,6 @@ calculate_col_widths (ClutterTableLayout *self,
}
}
}
-
-
}
/* calculate final widths */
@@ -1135,7 +1133,7 @@ calculate_row_heights (ClutterTableLayout *self,
}
if (!rows[i].expand)
- rows[i].expand = meta->y_fill;
+ rows[i].expand = meta->y_expand;
}
min_height += priv->row_spacing * (meta->row_span - 1);
@@ -1200,7 +1198,6 @@ calculate_row_heights (ClutterTableLayout *self,
}
}
}
-
}
/* calculate final heights */
--
1.7.7.6

9
clutter.spec
View File

@ -1,6 +1,6 @@
Name: clutter
Version: 1.10.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Open Source software library for creating rich graphical user interfaces
Group: Development/Libraries
@ -8,6 +8,9 @@ License: LGPLv2+
URL: http://www.clutter-project.org/
Source0: http://www.clutter-project.org/sources/%{name}/1.10/%{name}-%{version}.tar.xz
# upstream fix
Patch01: 0001-table-layout-Fix-xy-_expand.patch
BuildRequires: glib2-devel mesa-libGL-devel pkgconfig pango-devel
BuildRequires: cairo-gobject-devel gdk-pixbuf2-devel atk-devel
BuildRequires: cogl-devel >= 1.9.8
@ -59,6 +62,7 @@ This package contains documentation for clutter.
%prep
%setup -q
%patch01 -p1
%build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@ -103,6 +107,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{_datadir}/gtk-doc/html/cally
%changelog
* Fri Apr 06 2012 Zeeshan Ali <zeenix@redhat.com> - 1.10.0-4
- Include layout fix (Needed by gnome-boxes at least).
* Wed Apr 04 2012 Kalev Lember <kalevlember@gmail.com> - 1.10.0-3
- Obsolete clutter-gesture and clutter-imcontext packages (#809864)