2009-03-10 Alberto Garcia <agarcia@igalia.com>

[hildon] / src / hildon-app-menu.c

diff --git a/src/hildon-app-menu.c b/src/hildon-app-menu.c
index 4123fe8..0813d8a 100644 (file)
--- a/src/hildon-app-menu.c
+++ b/src/hildon-app-menu.c
@@ -755,9 +755,8 @@ hildon_app_menu_unrealize                       (GtkWidget *widget)
 static void
 hildon_app_menu_apply_style                     (GtkWidget *widget)
 {
-    GdkScreen *screen;
-    gint width;
-    guint horizontal_spacing, vertical_spacing, inner_border, external_border;
+    guint horizontal_spacing, vertical_spacing, filter_vertical_spacing;
+    guint inner_border;
     HildonAppMenuPrivate *priv;
 
     priv = HILDON_APP_MENU_GET_PRIVATE (widget);
@@ -765,22 +764,17 @@ hildon_app_menu_apply_style                     (GtkWidget *widget)
     gtk_widget_style_get (widget,
                           "horizontal-spacing", &horizontal_spacing,
                           "vertical-spacing", &vertical_spacing,
+                          "filter-vertical-spacing", &filter_vertical_spacing,
                           "inner-border", &inner_border,
-                          "external-border", &external_border,
                           NULL);
 
     /* Set spacings */
     gtk_table_set_row_spacings (priv->table, vertical_spacing);
     gtk_table_set_col_spacings (priv->table, horizontal_spacing);
-    gtk_box_set_spacing (priv->vbox, vertical_spacing);
+    gtk_box_set_spacing (priv->vbox, filter_vertical_spacing);
 
     /* Set inner border */
     gtk_container_set_border_width (GTK_CONTAINER (widget), inner_border);
-
-    /* Set default size */
-    screen = gtk_widget_get_screen (widget);
-    width = gdk_screen_get_width (screen) - external_border * 2;
-    gtk_window_set_default_size (GTK_WINDOW (widget), width, -1);
 }
 
 static void
@@ -875,10 +869,6 @@ hildon_app_menu_repack_items                    (HildonAppMenu *menu,
     } else {
         gtk_table_resize (priv->table, row + 1, priv->columns);
     }
-
-    if (GTK_WIDGET_VISIBLE (GTK_WIDGET (menu))) {
-        gtk_window_reshow_with_initial_size (GTK_WINDOW (menu));
-    }
 }
 
 /**
@@ -1051,18 +1041,18 @@ hildon_app_menu_class_init                      (HildonAppMenuClass *klass)
     gtk_widget_class_install_style_property (
         widget_class,
         g_param_spec_uint (
-            "inner-border",
-            "Border between menu edges and buttons",
-            "Border between menu edges and buttons",
-            0, G_MAXUINT, 16,
+            "filter-vertical-spacing",
+            "Vertical spacing between filters and menu items",
+            "Vertical spacing between filters and menu items",
+            0, G_MAXUINT, 8,
             G_PARAM_READABLE));
 
     gtk_widget_class_install_style_property (
         widget_class,
         g_param_spec_uint (
-            "external-border",
-            "Border between menu and screen edges",
-            "Border between the right and left edges of the menu and the screen edges",
-            0, G_MAXUINT, 40,
+            "inner-border",
+            "Border between menu edges and buttons",
+            "Border between menu edges and buttons",
+            0, G_MAXUINT, 16,
             G_PARAM_READABLE));
 }