2009-01-13 Alberto Garcia <agarcia@igalia.com>

* src/hildon-edit-toolbar.c (hildon_edit_toolbar_init)
	(hildon_edit_toolbar_class_init, hildon_edit_toolbar_style_set):
	New "arrow-width" and "arrow-height" style properties to set the
	size of the arrow button.
	Set name of arrow button ("hildon-edit-toolbar-arrow").

	Fixes: NB#94970 (Hildon Edit Mode Toolbar should use back button
	graphics from theme)

diff --git a/ChangeLog b/ChangeLog
index 8f90084..ec710f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-01-13  Alberto Garcia  <agarcia@igalia.com>
+
+       * src/hildon-edit-toolbar.c (hildon_edit_toolbar_init)
+       (hildon_edit_toolbar_class_init, hildon_edit_toolbar_style_set):
+       New "arrow-width" and "arrow-height" style properties to set the
+       size of the arrow button.
+       Set name of arrow button ("hildon-edit-toolbar-arrow").
+
+       Fixes: NB#94970 (Hildon Edit Mode Toolbar should use back button
+       graphics from theme)
+
 2009-01-13  Claudio Saavedra  <csaavedra@igalia.com>
 
        * src/hildon-picker-button.c:

diff --git a/src/hildon-edit-toolbar.c b/src/hildon-edit-toolbar.c
index 56040bc..9c970c9 100644 (file)
--- a/src/hildon-edit-toolbar.c
+++ b/src/hildon-edit-toolbar.c
@@ -82,14 +82,52 @@ enum {
 
 static guint                                    toolbar_signals [N_SIGNALS] = { 0 };
 
+static void
+hildon_edit_toolbar_style_set                   (GtkWidget *widget,
+                                                 GtkStyle  *previous_style)
+{
+    guint width, height;
+    HildonEditToolbarPrivate *priv = HILDON_EDIT_TOOLBAR_GET_PRIVATE (widget);
+
+    if (GTK_WIDGET_CLASS (hildon_edit_toolbar_parent_class)->style_set)
+        GTK_WIDGET_CLASS (hildon_edit_toolbar_parent_class)->style_set (widget, previous_style);
+
+    gtk_widget_style_get (widget,
+                          "arrow-width", &width,
+                          "arrow-height", &height,
+                          NULL);
+
+    gtk_widget_set_size_request (GTK_WIDGET (priv->arrow), width, height);
+}
 
 static void
 hildon_edit_toolbar_class_init                  (HildonEditToolbarClass *klass)
 {
     GObjectClass *gobject_class = (GObjectClass *) klass;
+    GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
+
+    widget_class->style_set = hildon_edit_toolbar_style_set;
 
     g_type_class_add_private (klass, sizeof (HildonEditToolbarPrivate));
 
+    gtk_widget_class_install_style_property (
+        widget_class,
+        g_param_spec_uint (
+            "arrow-width",
+            "Width of the arrow button",
+            "Width of the arrow button",
+            0, G_MAXUINT, 112,
+            G_PARAM_READABLE));
+
+    gtk_widget_class_install_style_property (
+        widget_class,
+        g_param_spec_uint (
+            "arrow-height",
+            "Height of the arrow button",
+            "Height of the arrow button",
+            0, G_MAXUINT, 56,
+            G_PARAM_READABLE));
+
     /**
      * HildonEditToolbar::button-clicked:
      * @widget: the object which received the signal.
@@ -155,9 +193,9 @@ hildon_edit_toolbar_init                        (HildonEditToolbar *self)
     g_signal_connect (priv->button, "clicked", G_CALLBACK (button_clicked_cb), self);
     g_signal_connect (priv->arrow, "clicked", G_CALLBACK (arrow_clicked_cb), self);
 
-    /* Temporary values, should be replaced by properties or fixed values from the specs */
     gtk_box_set_spacing (hbox, 10);
-    gtk_widget_set_size_request (GTK_WIDGET (priv->arrow), 50, -1);
+
+    gtk_widget_set_name (GTK_WIDGET (priv->arrow), "hildon-edit-toolbar-arrow");
 
     gtk_box_pack_start (hbox, GTK_WIDGET (priv->label), TRUE, TRUE, 0);
     gtk_box_pack_start (hbox, GTK_WIDGET (priv->button), FALSE, FALSE, 0);