2009-02-18 Alberto Garcia <agarcia@igalia.com>

* src/hildon-window.c (paint_edit_toolbar): Fix style detail.

	* src/hildon-edit-toolbar.c (hildon_edit_toolbar_init):
	Add a GtkVSeparator between the button and the back arrow.
	Let the button have automatic size.
	Set a name to the widget for theming handling.

	Fixes: NB#101793 (Make edit toolbar the same height as window
	title bar (use title area theming))

diff --git a/ChangeLog b/ChangeLog
index 91ad72f..3ce0d3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2009-02-18  Alberto Garcia  <agarcia@igalia.com>
 
+       * src/hildon-window.c (paint_edit_toolbar): Fix style detail.
+
+       * src/hildon-edit-toolbar.c (hildon_edit_toolbar_init):
+       Add a GtkVSeparator between the button and the back arrow.
+       Let the button have automatic size.
+       Set a name to the widget for theming handling.
+
+       Fixes: NB#101793 (Make edit toolbar the same height as window
+       title bar (use title area theming))
+
+2009-02-18  Alberto Garcia  <agarcia@igalia.com>
+
        * src/hildon-helper.c (attach_new_color_element): Fix memory
        leak.
 

diff --git a/src/hildon-edit-toolbar.c b/src/hildon-edit-toolbar.c
index dd9341c..3884d04 100644 (file)
--- a/src/hildon-edit-toolbar.c
+++ b/src/hildon-edit-toolbar.c
@@ -182,10 +182,12 @@ static void
 hildon_edit_toolbar_init                        (HildonEditToolbar *self)
 {
     HildonEditToolbarPrivate *priv = HILDON_EDIT_TOOLBAR_GET_PRIVATE (self);
+    GtkWidget *separator;
     GtkBox *hbox = GTK_BOX (self);
 
     priv->label = GTK_LABEL (gtk_label_new (NULL));
-    priv->button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_AUTO_WIDTH | HILDON_SIZE_FINGER_HEIGHT));
+    priv->button = GTK_BUTTON (hildon_gtk_button_new (HILDON_SIZE_AUTO));
+    separator = gtk_vseparator_new ();
     priv->arrow = GTK_BUTTON (gtk_button_new ());
 
     gtk_button_set_focus_on_click (priv->arrow, FALSE);
@@ -193,18 +195,21 @@ 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);
 
-    gtk_box_set_spacing (hbox, 10);
+    gtk_box_set_spacing (hbox, 0);
 
+    gtk_widget_set_name (GTK_WIDGET (self), "toolbar-edit-mode");
     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);
+    gtk_box_pack_start (hbox, separator, FALSE, FALSE, 0);
     gtk_box_pack_start (hbox, GTK_WIDGET (priv->arrow), FALSE, FALSE, 0);
 
     gtk_misc_set_alignment (GTK_MISC (priv->label), 0, 0.5);
 
     gtk_widget_show (GTK_WIDGET (priv->label));
     gtk_widget_show (GTK_WIDGET (priv->button));
+    gtk_widget_show (separator);
     gtk_widget_show (GTK_WIDGET (priv->arrow));
 }
 

diff --git a/src/hildon-window.c b/src/hildon-window.c
index eb2131c..def87b0 100644 (file)
--- a/src/hildon-window.c
+++ b/src/hildon-window.c
@@ -968,7 +968,7 @@ paint_edit_toolbar                              (GtkWidget *widget,
 
     gtk_paint_box (widget->style, widget->window,
                    GTK_WIDGET_STATE (widget), GTK_SHADOW_OUT,
-                   &event->area, widget, "toolbar-primary",
+                   &event->area, widget, "toolbar-edit-mode",
                    toolbar->allocation.x,
                    toolbar->allocation.y,
                    toolbar->allocation.width,