diff options
author | Ross Burton <ross@openedhand.com> | 2008-01-29 11:03:37 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2008-01-29 11:03:37 +0000 |
commit | 83313dfbf431d937886cbc04499048e05e53d291 (patch) | |
tree | 71198760d7cffd24df40024ee77a787da7e3bd1c /meta/packages/gtk+/gtk+-2.12.6/combo-arrow-size.patch | |
parent | f1cfdb5072d465447b71b59403a5c9485954b326 (diff) | |
download | openembedded-core-83313dfbf431d937886cbc04499048e05e53d291.tar.gz openembedded-core-83313dfbf431d937886cbc04499048e05e53d291.tar.bz2 openembedded-core-83313dfbf431d937886cbc04499048e05e53d291.tar.xz openembedded-core-83313dfbf431d937886cbc04499048e05e53d291.zip |
gtk+: update to latest point release
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3613 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gtk+/gtk+-2.12.6/combo-arrow-size.patch')
-rw-r--r-- | meta/packages/gtk+/gtk+-2.12.6/combo-arrow-size.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/meta/packages/gtk+/gtk+-2.12.6/combo-arrow-size.patch b/meta/packages/gtk+/gtk+-2.12.6/combo-arrow-size.patch new file mode 100644 index 000000000..d44c454ce --- /dev/null +++ b/meta/packages/gtk+/gtk+-2.12.6/combo-arrow-size.patch @@ -0,0 +1,67 @@ +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 + FALSE, + GTK_PARAM_READABLE)); + ++ /** ++ * GtkComboBox:arrow-size: ++ * ++ * Sets the minimum size of the arrow in the combo box. Note ++ * that the arrow size is coupled to the font size, so in case ++ * a larger font is used, the arrow will be larger than set ++ * by arrow size. ++ * ++ * Since: 2.12 ++ */ ++ gtk_widget_class_install_style_property (widget_class, ++ g_param_spec_int ("arrow-size", ++ P_("Arrow Size"), ++ P_("The minimum size of the arrow in the combo box"), ++ 0, ++ G_MAXINT, ++ 15, ++ GTK_PARAM_READABLE)); ++ + g_type_class_add_private (object_class, sizeof (GtkComboBoxPrivate)); + } + +@@ -1897,7 +1916,12 @@ gtk_combo_box_size_request (GtkWidget + { + gint width, height; + gint focus_width, focus_pad; ++ gint font_size; ++ gint arrow_size; + GtkRequisition bin_req; ++ PangoContext *context; ++ PangoFontMetrics *metrics; ++ PangoFontDescription *font_desc; + + GtkComboBox *combo_box = GTK_COMBO_BOX (widget); + +@@ -1910,7 +1934,20 @@ gtk_combo_box_size_request (GtkWidget + 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, ++ pango_context_get_language (context)); ++ font_size = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) + ++ pango_font_metrics_get_descent (metrics)); ++ pango_font_metrics_unref (metrics); ++ ++ 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) + { |