[oe-commits] org.oe.dev gtk+ 2.10.14: fix combo-arrow-size.patch (from Poky) - closes #2845

[hrw commit]

gtk+ 2.10.14: fix combo-arrow-size.patch (from Poky) - closes #2845

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: b48de28301ae8c75622f3d839c1d89befaffa384
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b48de28301ae8c75622f3d839c1d89befaffa384
Files:
1
packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch
packages/gtk+/gtk+_2.10.14.bb
Diffs:

#
# mt diff -r1f7c705825e287dc5792adcdb318ce01dcf621dd -rb48de28301ae8c75622f3d839c1d89befaffa384
#
# 
# 
# patch "packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch"
#  from [86b154ddff681414b9ee93698f070af87eba8941]
#    to [9d6d322d625588710dd90fe34b558c083ec3baa4]
# 
# patch "packages/gtk+/gtk+_2.10.14.bb"
#  from [8ae4f9f76c8a1af983ec950a2c99047c7a8a0cc2]
#    to [66f337108f751a97bbfe129832a7cd2aef048d90]
# 
============================================================
--- packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch	86b154ddff681414b9ee93698f070af87eba8941
+++ packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch	9d6d322d625588710dd90fe34b558c083ec3baa4
@@ -1,11 +1,8 @@ Index: gtk/gtkcombobox.c
 Index: gtk/gtkcombobox.c
 ===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkcombobox.c,v
-retrieving revision 1.185
-diff -u -p -r1.185 gtkcombobox.c
---- gtk/gtkcombobox.c	12 Oct 2006 13:48:07 -0000	1.185
-+++ gtk/gtkcombobox.c	1 Nov 2006 19:01:09 -0000
-@@ -756,6 +756,25 @@ gtk_combo_box_class_init (GtkComboBoxCla
+--- gtk/gtkcombobox.c.orig	2007-08-21 11:10:15.000000000 +0000
++++ gtk/gtkcombobox.c	2007-08-21 11:13:00.000000000 +0000
+@@ -692,6 +692,25 @@
                                                                   FALSE,
                                                                   GTK_PARAM_READABLE));
  
@@ -31,26 +28,27 @@ diff -u -p -r1.185 gtkcombobox.c
    g_type_class_add_private (object_class, sizeof (GtkComboBoxPrivate));
  }
  
-@@ -1897,7 +1916,12 @@ gtk_combo_box_size_request (GtkWidget   
+@@ -1926,8 +1945,13 @@
  {
-   gint width, height;
+   GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
    gint focus_width, focus_pad;
 +  gint font_size;
 +  gint arrow_size;
-   GtkRequisition bin_req;
+   GtkAllocation child;
+   GtkRequisition req;
 +  PangoContext *context;
 +  PangoFontMetrics *metrics;
 +  PangoFontDescription *font_desc;
+   gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
  
-   GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
-  
-@@ -1910,7 +1934,20 @@ gtk_combo_box_size_request (GtkWidget   
+   widget->allocation = *allocation;
+@@ -1935,8 +1959,21 @@
    gtk_widget_style_get (GTK_WIDGET (widget),
  			"focus-line-width", &focus_width,
  			"focus-padding", &focus_pad,
 +			"arrow-size", &arrow_size,
  			NULL);
-+
+ 
 +  font_desc = GTK_BIN (widget)->child->style->font_desc;
 +  context = gtk_widget_get_pango_context (widget);
 +  metrics = pango_context_get_metrics (context, font_desc,
@@ -62,6 +60,7 @@ diff -u -p -r1.185 gtkcombobox.c
 +  arrow_size = MAX (arrow_size, font_size);
 +
 +  gtk_widget_set_size_request (combo_box->priv->arrow, arrow_size, arrow_size);
- 
++
    if (!combo_box->priv->tree_view)
      {
+       if (combo_box->priv->cell_view)
============================================================
--- packages/gtk+/gtk+_2.10.14.bb	8ae4f9f76c8a1af983ec950a2c99047c7a8a0cc2
+++ packages/gtk+/gtk+_2.10.14.bb	66f337108f751a97bbfe129832a7cd2aef048d90
@@ -1,6 +1,6 @@ require gtk-2.10.inc
 require gtk-2.10.inc
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \