From be1959e16cddc68d40bde2fc9943bcd640cfeb04 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Mon, 2 Jan 2012 00:09:08 +0000 Subject: [PATCH] Fix toolbar hiding bug On Mac OS, the toolbar is hidden by default because the menus are part of the OS menu bar. However they were incorrectly re-shown after toggling fullscreen. --- src/aweather-gui.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/aweather-gui.c b/src/aweather-gui.c index df5e846..4c234e5 100644 --- a/src/aweather-gui.c +++ b/src/aweather-gui.c @@ -180,7 +180,9 @@ G_MODULE_EXPORT void on_fullscreen(GtkToggleAction *action, AWeatherGui *self) GtkWidget *toolbar = aweather_gui_get_widget(self, "main_toolbar"); GtkWidget *sidebar = aweather_gui_get_widget(self, "main_sidebar"); GtkWidget *tabs = aweather_gui_get_widget(self, "main_tabs"); + static gboolean menushow = TRUE; // Toolbar can be always disabled if (gtk_toggle_action_get_active(action)) { + menushow = gtk_widget_get_visible(menu); gtk_window_fullscreen(GTK_WINDOW(self)); gtk_widget_hide(menu); _gtk_widget_autohide(toolbar, GTK_WIDGET(self->viewer), GTK_POS_TOP); @@ -188,7 +190,7 @@ G_MODULE_EXPORT void on_fullscreen(GtkToggleAction *action, AWeatherGui *self) _gtk_widget_autohide(tabs, GTK_WIDGET(self->viewer), GTK_POS_BOTTOM); } else { gtk_window_unfullscreen(GTK_WINDOW(self)); - gtk_widget_show(menu); + gtk_widget_set_visible(menu, menushow); _gtk_widget_autoshow(toolbar); _gtk_widget_autoshow(sidebar); _gtk_widget_autoshow(tabs); -- 2.43.2