From 2d9fc68144b4b44c90a73756075b24dae8060380 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Thu, 3 Dec 2009 15:13:45 +0100 Subject: [PATCH] Add fullscreen support in gtk --- src/gtk/modest-gtk-window-mgr.c | 18 +++++++++++++++++- src/modest-ui-actions.c | 3 --- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/gtk/modest-gtk-window-mgr.c b/src/gtk/modest-gtk-window-mgr.c index 9e7f62f..d450e5c 100644 --- a/src/gtk/modest-gtk-window-mgr.c +++ b/src/gtk/modest-gtk-window-mgr.c @@ -114,6 +114,8 @@ struct _ModestGtkWindowMgrPrivate { gulong accounts_handler; GtkWidget *shell; + + gboolean fullscreen; }; #define MODEST_GTK_WINDOW_MGR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_GTK_WINDOW_MGR, \ @@ -190,6 +192,7 @@ modest_gtk_window_mgr_instance_init (ModestGtkWindowMgr *obj) priv->modal_windows = g_queue_new (); priv->queue_lock = g_mutex_new (); + priv->fullscreen = FALSE; /* Could not initialize it from gconf, singletons are not ready yet */ @@ -752,13 +755,26 @@ modest_gtk_window_mgr_set_fullscreen_mode (ModestWindowMgr *self, { g_return_if_fail (MODEST_IS_GTK_WINDOW_MGR (self)); + ModestGtkWindowMgrPrivate *priv = NULL; + priv = MODEST_GTK_WINDOW_MGR_GET_PRIVATE (self); + + priv->fullscreen = on; + + if (on) { + gtk_window_fullscreen (GTK_WINDOW (priv->shell)); + } else { + gtk_window_unfullscreen (GTK_WINDOW (priv->shell)); + } return; } static gboolean modest_gtk_window_mgr_get_fullscreen_mode (ModestWindowMgr *self) { - return FALSE; + ModestGtkWindowMgrPrivate *priv = NULL; + priv = MODEST_GTK_WINDOW_MGR_GET_PRIVATE (self); + + return priv->fullscreen; } static void diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index bb5b755..8ecf384 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -4082,9 +4082,6 @@ modest_ui_actions_on_change_fullscreen (GtkAction *action, fullscreen = modest_window_mgr_get_fullscreen_mode (mgr); modest_window_mgr_set_fullscreen_mode (mgr, !fullscreen); -#ifndef MODEST_TOOLKIT_HILDON2 - gtk_window_present (GTK_WINDOW (window)); -#endif } /* -- 1.7.9.5