summaryrefslogtreecommitdiffstats
path: root/meta/packages/gtk+
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-07-23 14:49:30 +0000
committerRoss Burton <ross@openedhand.com>2007-07-23 14:49:30 +0000
commitfb37f45e2dc174e7865c4cc46b7aa67120da8f7c (patch)
tree42109a7a6dbed29a244c7fb5baad9203e0c6a6c6 /meta/packages/gtk+
parent450b758e1746a2a6ef9424c1db7d548e972ee895 (diff)
downloadpoky-fb37f45e2dc174e7865c4cc46b7aa67120da8f7c.tar.gz
Add scrolled window placement fixing patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2209 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gtk+')
-rw-r--r--meta/packages/gtk+/gtk+-2.10.12/scrolled-placement.patch35
-rw-r--r--meta/packages/gtk+/gtk+_2.10.12.bb7
2 files changed, 39 insertions, 3 deletions
diff --git a/meta/packages/gtk+/gtk+-2.10.12/scrolled-placement.patch b/meta/packages/gtk+/gtk+-2.10.12/scrolled-placement.patch
new file mode 100644
index 0000000000..09ded531ea
--- /dev/null
+++ b/meta/packages/gtk+/gtk+-2.10.12/scrolled-placement.patch
@@ -0,0 +1,35 @@
1Index: gtk/gtkscrolledwindow.c
2===================================================================
3--- gtk/gtkscrolledwindow.c (revision 18493)
4+++ gtk/gtkscrolledwindow.c (working copy)
5@@ -885,7 +885,7 @@
6 if (GTK_IS_SCROLLED_WINDOW (widget))
7 {
8 gtk_scrolled_window_update_real_placement (GTK_SCROLLED_WINDOW (widget));
9- gtk_widget_queue_draw (widget);
10+ gtk_widget_queue_resize (widget);
11 }
12 else if (GTK_IS_CONTAINER (widget))
13 gtk_container_forall (GTK_CONTAINER (widget), traverse_container, NULL);
14Index: gdk/x11/gdksettings.c
15===================================================================
16--- gdk/x11/gdksettings.c (revision 18493)
17+++ gdk/x11/gdksettings.c (working copy)
18@@ -65,7 +65,8 @@
19 "Xft/RGBA\0" "gtk-xft-rgba\0"
20 "Xft/DPI\0" "gtk-xft-dpi\0"
21 "Net/FallbackIconTheme\0" "gtk-fallback-icon-theme\0"
22- "Gtk/TouchscreenMode\0" "gtk-touchscreen-mode\0";
23+ "Gtk/TouchscreenMode\0" "gtk-touchscreen-mode\0"
24+ "Gtk/ScrolledWindowPlacement\0" "gtk-scrolled-window-placement\0";
25
26 static const struct
27 {
28@@ -107,5 +108,6 @@
29 { 1197, 1206 },
30 { 1219, 1227 },
31 { 1239, 1261 },
32- { 1285, 1305 }
33+ { 1285, 1305 },
34+ { 1326, 1354 }
35 };
diff --git a/meta/packages/gtk+/gtk+_2.10.12.bb b/meta/packages/gtk+/gtk+_2.10.12.bb
index 5bb3a84294..4c0e63fcf1 100644
--- a/meta/packages/gtk+/gtk+_2.10.12.bb
+++ b/meta/packages/gtk+/gtk+_2.10.12.bb
@@ -1,7 +1,7 @@
1require gtk+.inc 1require gtk+.inc
2 2
3DEPENDS += "cairo" 3DEPENDS += "cairo"
4PR = "r7" 4PR = "r9"
5 5
6# disable per default - untested and not all patches included. 6# disable per default - untested and not all patches included.
7DEFAULT_PREFERENCE = "-1" 7DEFAULT_PREFERENCE = "-1"
@@ -13,7 +13,6 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
13 file://gtklabel-resize-patch;patch=1 \ 13 file://gtklabel-resize-patch;patch=1 \
14 file://menu-deactivate.patch;patch=1 \ 14 file://menu-deactivate.patch;patch=1 \
15 file://xsettings.patch;patch=1 \ 15 file://xsettings.patch;patch=1 \
16 file://scroll-timings.patch;patch=1 \
17 file://small-gtkfilesel.patch;patch=1 \ 16 file://small-gtkfilesel.patch;patch=1 \
18 file://migration.patch;patch=1;pnum=0 \ 17 file://migration.patch;patch=1;pnum=0 \
19 file://run-iconcache.patch;patch=1 \ 18 file://run-iconcache.patch;patch=1 \
@@ -21,7 +20,9 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
21 file://hardcoded_libtool.patch;patch=1 \ 20 file://hardcoded_libtool.patch;patch=1 \
22 file://no-demos.patch;patch=1 \ 21 file://no-demos.patch;patch=1 \
23 file://cellrenderer-cairo.patch;patch=1;pnum=0 \ 22 file://cellrenderer-cairo.patch;patch=1;pnum=0 \
24 file://entry-cairo.patch;patch=1;pnum=0" 23 file://entry-cairo.patch;patch=1;pnum=0 \
24 file://scrolled-placement.patch;patch=1;pnum=0"
25# file://scroll-timings.patch;patch=1 \
25# file://pangoxft2.10.6.diff;patch=1" 26# file://pangoxft2.10.6.diff;patch=1"
26# file://gtk+-handhelds.patch;patch=1 27# file://gtk+-handhelds.patch;patch=1
27# file://single-click.patch;patch=1 28# file://single-click.patch;patch=1