From 61db36b90ed6ee68a3f50894d0020884c0b2b284 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sergio=20Villar=20Sen=C3=ADn?= Date: Tue, 26 Jan 2010 17:06:14 +0100 Subject: [PATCH] Set a MODEST_MARGIN_HALF margin in the top of the editor window Fixes NB#154396 --- src/widgets/modest-msg-edit-window.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/widgets/modest-msg-edit-window.c b/src/widgets/modest-msg-edit-window.c index e042b8d..e1a24f3 100644 --- a/src/widgets/modest-msg-edit-window.c +++ b/src/widgets/modest-msg-edit-window.c @@ -1057,15 +1057,14 @@ init_window (ModestMsgEditWindow *obj) NULL); gtk_widget_set_no_show_all (priv->isearch_toolbar, TRUE); -/* g_signal_connect (G_OBJECT (obj), "key_pressed", G_CALLBACK (on_key_pressed), NULL) */ - priv->scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ()); g_object_set (G_OBJECT (priv->scrollable), "horizontal-policy", GTK_POLICY_NEVER, NULL); - + main_vbox = gtk_vbox_new (FALSE, DEFAULT_MAIN_VBOX_SPACING); window_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); - gtk_alignment_set_padding (GTK_ALIGNMENT (window_align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DEFAULT); + gtk_alignment_set_padding (GTK_ALIGNMENT (window_align), MODEST_MARGIN_HALF, 0, + MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DEFAULT); gtk_box_pack_start (GTK_BOX(main_vbox), priv->header_box, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 0); @@ -1073,14 +1072,20 @@ init_window (ModestMsgEditWindow *obj) modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (priv->scrollable), window_align); gtk_widget_show_all (GTK_WIDGET(priv->scrollable)); - + window_box = gtk_vbox_new (FALSE, 0); gtk_container_add (GTK_CONTAINER(obj), window_box); gtk_box_pack_start (GTK_BOX (window_box), priv->scrollable, TRUE, TRUE, 0); + /* Set window icon */ + window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG); + if (window_icon) { + gtk_window_set_icon (GTK_WINDOW (obj), window_icon); + g_object_unref (window_icon); + } } - + static void modest_msg_edit_window_disconnect_signals (ModestWindow *window) { -- 1.7.9.5