X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=b65c5510f72b5d171645f44acc19f033b17972e7;hp=614fe61cfa859b014c436b5d29a09507cc56cbbc;hb=0a229140b86735e909f7e596378e7e7013825076;hpb=aae5f5a4e2a4c8e4dfa48494df86981ebfdfa5bc

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 614fe61..b65c551 100644
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1330,6 +1330,53 @@ modest_main_window_get_style (ModestMainWindow *self)
 	return priv->style;
 }
 
+static void
+toolbar_resize (ModestMainWindow *self)
+{
+	ModestMainWindowPrivate *priv = NULL;
+	ModestWindowPrivate *parent_priv = NULL;
+	GtkWidget *widget;
+	gint static_button_size;
+	ModestWindowMgr *mgr;
+
+	g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
+	priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+	parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+	mgr = modest_runtime_get_window_mgr ();
+	static_button_size = modest_window_mgr_get_fullscreen_mode (mgr)?118:108;
+
+	if (parent_priv->toolbar) {
+		/* left size buttons */
+		widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageNew");
+		gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
+		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
+		gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);
+		widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply");
+		gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
+		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
+		gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);
+		widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarDeleteMessage");
+		gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
+		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
+		gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);
+		widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToggleFolders");
+		gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE);
+		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE);
+		gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1);
+		
+ 		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE);
+		gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
+		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
+		gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
+		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->refresh_toolitem), TRUE);
+		gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->refresh_toolitem), TRUE);
+		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->sort_toolitem), TRUE);
+		gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->sort_toolitem), TRUE);
+	}
+		
+}
+
 
 
 static gboolean
@@ -1353,20 +1400,14 @@ modest_main_window_window_state_event (GtkWidget *widget, GdkEventWindowState *e
 		if (is_fullscreen != active) {
 			gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), is_fullscreen);
 		}
+
+		toolbar_resize (MODEST_MAIN_WINDOW (widget));
 	}
 
 	return FALSE;
 
 }
 
-static void
-set_homogeneous (GtkWidget *widget,
-		 gpointer data)
-{
-	gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), TRUE);
-	gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), TRUE);
-}
-
 static void 
 modest_main_window_show_toolbar (ModestWindow *self,
 				 gboolean show_toolbar)
@@ -1391,19 +1432,12 @@ modest_main_window_show_toolbar (ModestWindow *self,
 								  "/ToolBar");
 		gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE);
 
-		/* Set homogeneous toolbar */
-		gtk_container_foreach (GTK_CONTAINER (parent_priv->toolbar), 
-				       set_homogeneous, NULL);
-	
 		priv->progress_toolitem = GTK_WIDGET (gtk_tool_item_new ());
 		priv->cancel_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarCancel");
 		priv->refresh_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive");
 		priv->sort_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSort");
- 		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
-		gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
-		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
-		gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE);
-
+		toolbar_resize (MODEST_MAIN_WINDOW (self));
+		
 		/* Add ProgressBar (Transfer toolbar) */ 
 		priv->progress_bar = modest_progress_bar_widget_new ();
 		gtk_widget_set_no_show_all (priv->progress_bar, TRUE);