diff options
author | Richard Purdie <richard@openedhand.com> | 2007-08-21 11:16:29 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-08-21 11:16:29 +0000 |
commit | 686161ae9fedbd0d847d0d61bd31137327da2800 (patch) | |
tree | 4648e73fdb96b2a391ddc1babe012198a81ba076 /meta/packages/gtk+/gtk+-2.10.14 | |
parent | f041a4d9ab55e5124d465742ea468e6ad55b412f (diff) | |
download | poky-686161ae9fedbd0d847d0d61bd31137327da2800.tar.gz |
gtk+: Refresh misbehaving patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2528 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gtk+/gtk+-2.10.14')
-rw-r--r-- | meta/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/meta/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch b/meta/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch index d44c454ce3..ec408a5f28 100644 --- a/meta/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch +++ b/meta/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch | |||
@@ -1,11 +1,8 @@ | |||
1 | Index: gtk/gtkcombobox.c | 1 | Index: gtk/gtkcombobox.c |
2 | =================================================================== | 2 | =================================================================== |
3 | RCS file: /cvs/gnome/gtk+/gtk/gtkcombobox.c,v | 3 | --- gtk/gtkcombobox.c.orig 2007-08-21 11:10:15.000000000 +0000 |
4 | retrieving revision 1.185 | 4 | +++ gtk/gtkcombobox.c 2007-08-21 11:13:00.000000000 +0000 |
5 | diff -u -p -r1.185 gtkcombobox.c | 5 | @@ -692,6 +692,25 @@ |
6 | --- gtk/gtkcombobox.c 12 Oct 2006 13:48:07 -0000 1.185 | ||
7 | +++ gtk/gtkcombobox.c 1 Nov 2006 19:01:09 -0000 | ||
8 | @@ -756,6 +756,25 @@ gtk_combo_box_class_init (GtkComboBoxCla | ||
9 | FALSE, | 6 | FALSE, |
10 | GTK_PARAM_READABLE)); | 7 | GTK_PARAM_READABLE)); |
11 | 8 | ||
@@ -31,26 +28,27 @@ diff -u -p -r1.185 gtkcombobox.c | |||
31 | g_type_class_add_private (object_class, sizeof (GtkComboBoxPrivate)); | 28 | g_type_class_add_private (object_class, sizeof (GtkComboBoxPrivate)); |
32 | } | 29 | } |
33 | 30 | ||
34 | @@ -1897,7 +1916,12 @@ gtk_combo_box_size_request (GtkWidget | 31 | @@ -1926,8 +1945,13 @@ |
35 | { | 32 | { |
36 | gint width, height; | 33 | GtkComboBox *combo_box = GTK_COMBO_BOX (widget); |
37 | gint focus_width, focus_pad; | 34 | gint focus_width, focus_pad; |
38 | + gint font_size; | 35 | + gint font_size; |
39 | + gint arrow_size; | 36 | + gint arrow_size; |
40 | GtkRequisition bin_req; | 37 | GtkAllocation child; |
38 | GtkRequisition req; | ||
41 | + PangoContext *context; | 39 | + PangoContext *context; |
42 | + PangoFontMetrics *metrics; | 40 | + PangoFontMetrics *metrics; |
43 | + PangoFontDescription *font_desc; | 41 | + PangoFontDescription *font_desc; |
42 | gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL; | ||
44 | 43 | ||
45 | GtkComboBox *combo_box = GTK_COMBO_BOX (widget); | 44 | widget->allocation = *allocation; |
46 | 45 | @@ -1935,8 +1959,21 @@ | |
47 | @@ -1910,7 +1934,20 @@ gtk_combo_box_size_request (GtkWidget | ||
48 | gtk_widget_style_get (GTK_WIDGET (widget), | 46 | gtk_widget_style_get (GTK_WIDGET (widget), |
49 | "focus-line-width", &focus_width, | 47 | "focus-line-width", &focus_width, |
50 | "focus-padding", &focus_pad, | 48 | "focus-padding", &focus_pad, |
51 | + "arrow-size", &arrow_size, | 49 | + "arrow-size", &arrow_size, |
52 | NULL); | 50 | NULL); |
53 | + | 51 | |
54 | + font_desc = GTK_BIN (widget)->child->style->font_desc; | 52 | + font_desc = GTK_BIN (widget)->child->style->font_desc; |
55 | + context = gtk_widget_get_pango_context (widget); | 53 | + context = gtk_widget_get_pango_context (widget); |
56 | + metrics = pango_context_get_metrics (context, font_desc, | 54 | + metrics = pango_context_get_metrics (context, font_desc, |
@@ -62,6 +60,7 @@ diff -u -p -r1.185 gtkcombobox.c | |||
62 | + arrow_size = MAX (arrow_size, font_size); | 60 | + arrow_size = MAX (arrow_size, font_size); |
63 | + | 61 | + |
64 | + gtk_widget_set_size_request (combo_box->priv->arrow, arrow_size, arrow_size); | 62 | + gtk_widget_set_size_request (combo_box->priv->arrow, arrow_size, arrow_size); |
65 | 63 | + | |
66 | if (!combo_box->priv->tree_view) | 64 | if (!combo_box->priv->tree_view) |
67 | { | 65 | { |
66 | if (combo_box->priv->cell_view) | ||