summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-03-02 17:14:51 +0000
committerRichard Purdie <richard@openedhand.com>2008-03-02 17:14:51 +0000
commit9f9900b9b4ef2d2e855293f7850f81fa0f33a616 (patch)
treef226d9e5de74a3c40011a6b4b3751ba2d6d46dd9 /meta
parent639f3823f570ae0b30e9dd39d7fee2ce8a310ad9 (diff)
downloadpoky-9f9900b9b4ef2d2e855293f7850f81fa0f33a616.tar.gz
gtk+: Updated filechooser size patch from Thomas
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3885 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/gtk+/gtk+-2.12.7/filechooser-sizefix.patch40
-rw-r--r--meta/packages/gtk+/gtk+_2.12.7.bb2
2 files changed, 23 insertions, 19 deletions
diff --git a/meta/packages/gtk+/gtk+-2.12.7/filechooser-sizefix.patch b/meta/packages/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
index 4de68dfb98..694b059b9a 100644
--- a/meta/packages/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
+++ b/meta/packages/gtk+/gtk+-2.12.7/filechooser-sizefix.patch
@@ -1,21 +1,5 @@
1 1--- gtk+-2.12.7.orig/gtk/gtkfilechooserdialog.c
2diff -ur /tmp/gtk+-2.12.7/gtk/gtkfilechooserdefault.c ./gtk/gtkfilechooserdefault.c 2+++ gtk+-2.12.7/gtk/gtkfilechooserdialog.c
3--- /tmp/gtk+-2.12.7/gtk/gtkfilechooserdefault.c 2008-02-29 17:00:14.000000000 +0000
4+++ ./gtk/gtkfilechooserdefault.c 2008-02-29 17:25:21.000000000 +0000
5@@ -178,8 +178,8 @@
6 #define FALLBACK_ICON_SIZE 24
7
8 #define LIST_HBOX_SPACING DEFAULT_SPACING
9-#define NUM_LINES 45
10-#define NUM_CHARS 60
11+#define NUM_LINES 10
12+#define NUM_CHARS 12
13
14 static void gtk_file_chooser_default_iface_init (GtkFileChooserIface *iface);
15 static void gtk_file_chooser_embed_default_iface_init (GtkFileChooserEmbedIface *iface);
16diff -ur /tmp/gtk+-2.12.7/gtk/gtkfilechooserdialog.c ./gtk/gtkfilechooserdialog.c
17--- /tmp/gtk+-2.12.7/gtk/gtkfilechooserdialog.c 2008-01-30 03:11:07.000000000 +0000
18+++ ./gtk/gtkfilechooserdialog.c 2008-02-29 17:20:30.000000000 +0000
19@@ -165,10 +165,10 @@ 3@@ -165,10 +165,10 @@
20 gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); 4 gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
21 5
@@ -29,3 +13,23 @@ diff -ur /tmp/gtk+-2.12.7/gtk/gtkfilechooserdialog.c ./gtk/gtkfilechooserdialog.
29 } 13 }
30 14
31 static void 15 static void
16@@ -183,6 +183,7 @@
17
18 priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
19
20+#if 0
21 /* Unset any previously set size */
22 gtk_widget_set_size_request (GTK_WIDGET (dialog), -1, -1);
23
24@@ -209,6 +210,11 @@
25 /* Ideal target size plus any extra size */
26 width = default_width + width + (2 * GTK_CONTAINER (dialog)->border_width);
27 height = default_height + height + (2 * GTK_CONTAINER (dialog)->border_width);
28+#endif
29+
30+ /* for small screens we just hard code a sensible value */
31+ width = 350;
32+ height = 350;
33
34 if (GTK_WIDGET_REALIZED (dialog))
35 clamp_to_screen (GTK_WIDGET (dialog), &width, &height);
diff --git a/meta/packages/gtk+/gtk+_2.12.7.bb b/meta/packages/gtk+/gtk+_2.12.7.bb
index f66b4b80b2..1f3e6e394e 100644
--- a/meta/packages/gtk+/gtk+_2.12.7.bb
+++ b/meta/packages/gtk+/gtk+_2.12.7.bb
@@ -1,7 +1,7 @@
1require gtk+.inc 1require gtk+.inc
2 2
3DEPENDS += "cairo" 3DEPENDS += "cairo"
4PR = "r5" 4PR = "r6"
5 5
6SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \ 6SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
7 file://xsettings.patch;patch=1 \ 7 file://xsettings.patch;patch=1 \