From 828cb20d18fc67aabe22d13c4e3c519e6611f908 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Thu, 26 Jul 2007 10:35:02 +0000
Subject: Add patch so that the size of the toggle cell renderer is based on
 font size

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2228 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/gtk+/gtk+-2.6.10/toggle-font.diff | 69 +++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 meta/packages/gtk+/gtk+-2.6.10/toggle-font.diff

(limited to 'meta/packages/gtk+/gtk+-2.6.10')

diff --git a/meta/packages/gtk+/gtk+-2.6.10/toggle-font.diff b/meta/packages/gtk+/gtk+-2.6.10/toggle-font.diff
new file mode 100644
index 0000000000..ad3bc6e38c
--- /dev/null
+++ b/meta/packages/gtk+/gtk+-2.6.10/toggle-font.diff
@@ -0,0 +1,69 @@
+Index: gtk/gtkcellrenderertoggle.c
+===================================================================
+--- gtk/gtkcellrenderertoggle.c	(revision 18542)
++++ gtk/gtkcellrenderertoggle.c	(working copy)
+@@ -80,6 +80,8 @@
+ typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate;
+ struct _GtkCellRendererTogglePrivate
+ {
++  gint indicator_size;
++  GtkWidget *cached_widget;
+   guint inconsistent : 1;
+ };
+ 
+@@ -281,6 +283,27 @@
+ }
+ 
+ static void
++on_widget_style_set (GtkWidget *widget, GtkStyle *previous, gpointer user_data)
++{
++  GtkCellRendererTogglePrivate *priv = user_data;
++  PangoContext *context;
++  PangoFontMetrics *metrics;
++  int height;
++  
++  context = gtk_widget_get_pango_context (widget);
++  metrics = pango_context_get_metrics (context,
++                                       widget->style->font_desc,
++                                       pango_context_get_language (context));
++
++  height = pango_font_metrics_get_ascent (metrics) +
++    pango_font_metrics_get_descent (metrics);
++  
++  pango_font_metrics_unref (metrics);
++  
++  priv->indicator_size = PANGO_PIXELS (height * 0.85);
++}
++
++static void
+ gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
+ 				   GtkWidget       *widget,
+ 				   GdkRectangle    *cell_area,
+@@ -291,10 +314,25 @@
+ {
+   gint calc_width;
+   gint calc_height;
++  GtkCellRendererTogglePrivate *priv;
+ 
+-  calc_width = (gint) cell->xpad * 2 + TOGGLE_WIDTH;
+-  calc_height = (gint) cell->ypad * 2 + TOGGLE_WIDTH;
++  priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell);
+ 
++  if (priv->cached_widget != widget) {
++    if (priv->cached_widget) {
++      g_object_remove_weak_pointer (widget, &priv->cached_widget);
++      g_signal_handlers_disconnect_by_func (priv->cached_widget, on_widget_style_set, priv);
++    }
++    priv->cached_widget = widget;
++    g_object_add_weak_pointer (widget, &priv->cached_widget);
++    g_signal_connect (widget, "style-set", on_widget_style_set, priv);
++    
++    on_widget_style_set (widget, NULL, priv);
++  }
++
++  calc_width = (gint) cell->xpad * 2 + priv->indicator_size;
++  calc_height = (gint) cell->ypad * 2 + priv->indicator_size;
++
+   if (width)
+     *width = calc_width;
+ 
-- 
cgit v1.2.3-54-g00ecf