From 6a6479ca2b2c1fd5aa78c860299d1a96ef51f199 Mon Sep 17 00:00:00 2001 From: David Bordoley Date: Wed, 30 Apr 2003 15:23:59 +0000 Subject: src/ephy-window.c data/epiphany.schemas.in 2003-04-30 David Bordoley * src/ephy-window.c * data/epiphany.schemas.in * lib/ephy-prefs.h: Remove fullscreen-only prefs for which UI items to display. Now fullscreen respects the "View" menu toggles for UI items - but the menu bar is not shown in fullscreen view. See bug 111747 for details. Patch from Lee Willis --- src/ephy-window.c | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/ephy-window.c b/src/ephy-window.c index 34cfc588c..fc7df0281 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -604,13 +604,6 @@ save_window_chrome (EphyWindow *window) else if (flags & EMBED_CHROME_PPVIEWTOOLBARON) { } - else if (flags & EMBED_CHROME_OPENASFULLSCREEN) - { - eel_gconf_set_boolean (CONF_WINDOWS_FS_SHOW_TOOLBARS, - flags & EMBED_CHROME_TOOLBARON); - eel_gconf_set_boolean (CONF_WINDOWS_FS_SHOW_STATUSBAR, - flags & EMBED_CHROME_STATUSBARON); - } else { eel_gconf_set_boolean (CONF_WINDOWS_SHOW_BOOKMARKS_BAR, @@ -749,32 +742,22 @@ translate_default_chrome (EmbedChromeMask *chrome_mask) EMBED_CHROME_OPENASFULLSCREEN); /* Load defaults */ - if (*chrome_mask & EMBED_CHROME_OPENASFULLSCREEN) + if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_STATUSBAR)) { - if (eel_gconf_get_boolean (CONF_WINDOWS_FS_SHOW_STATUSBAR)) - { - *chrome_mask |= EMBED_CHROME_STATUSBARON; - } - if (eel_gconf_get_boolean (CONF_WINDOWS_FS_SHOW_TOOLBARS)) - { - *chrome_mask |= EMBED_CHROME_TOOLBARON; - } + *chrome_mask |= EMBED_CHROME_STATUSBARON; } - else + if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_TOOLBARS)) { - if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_STATUSBAR)) - { - *chrome_mask |= EMBED_CHROME_STATUSBARON; - } - if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_TOOLBARS)) - { - *chrome_mask |= EMBED_CHROME_TOOLBARON; - } - if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_BOOKMARKS_BAR)) - { - *chrome_mask |= EMBED_CHROME_BOOKMARKSBARON; - } + *chrome_mask |= EMBED_CHROME_TOOLBARON; + } + if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_BOOKMARKS_BAR)) + { + *chrome_mask |= EMBED_CHROME_BOOKMARKSBARON; + } + // Show the menu bar if we're not in fullscreen + if (!(*chrome_mask & EMBED_CHROME_OPENASFULLSCREEN)) + { *chrome_mask |= EMBED_CHROME_MENUBARON; } } -- cgit