[maemo-commits] [maemo-commits] r9863 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: timj
Date: 2007-02-14 17:01:47 +0200 (Wed, 14 Feb 2007)
New Revision: 9863

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrange.c
Log:
Wed Feb 14 15:57:12 2007  Tim Janik  <timj at gtk.org>

        * gtk/gtkrange.c: applied arrow_paint_box_layout MAEMO patch to
        allocate range arrows with the maximum available space.




Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-14 14:58:46 UTC (rev 9862)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-14 15:01:47 UTC (rev 9863)
@@ -1,3 +1,8 @@
+Wed Feb 14 15:57:12 2007  Tim Janik  <timj at gtk.org>
+
+	* gtk/gtkrange.c: applied arrow_paint_box_layout MAEMO patch to
+	allocate range arrows with the maximum available space.
+
 2007-02-14  Kristian Rietveld  <kris at imendio.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_bin_expose): move around

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrange.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrange.c	2007-02-14 14:58:46 UTC (rev 9862)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkrange.c	2007-02-14 15:01:47 UTC (rev 9863)
@@ -507,6 +507,21 @@
                                                                  GTK_PARAM_READABLE));
 
   g_type_class_add_private (class, sizeof (GtkRangeLayout));
+#ifdef MAEMO_CHANGES
+  /**
+   * GtkRange:arrow-paint-box-layout:
+   *
+   * Allows to use images instead of normal arrows.
+   *
+   * Since: maemo 1.0
+   */
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_boolean ("arrow-paint-box-layout",
+                                                                 P_("Arrow paint box layout"),
+                                                                 P_("Allocate range arrows with the maximum available space."),
+                                                                 FALSE,
+                                                                 GTK_PARAM_READABLE));
+#endif /* MAEMO_CHANGES */
 }
 
 static void
@@ -1358,6 +1373,18 @@
   arrow_height = rect->height / 2;
   arrow_x = widget->allocation.x + rect->x + (rect->width - arrow_width) / 2;
   arrow_y = widget->allocation.y + rect->y + (rect->height - arrow_height) / 2;
+
+#ifdef MAEMO_CHANGES
+  gboolean arrow_paint_box_layout = FALSE;
+  gtk_widget_style_get (widget, "arrow-paint-box-layout", &arrow_paint_box_layout, NULL);
+  if (arrow_paint_box_layout)
+    {
+      arrow_width = rect->width;
+      arrow_height = rect->height;
+      arrow_x = widget->allocation.x + rect->x;
+      arrow_y = widget->allocation.y + rect->y;
+    }
+#endif /* MAEMO_CHANGES */
   
   if (clicked && arrow_sensitive)
     {