diff options
| author | David Bordoley <bordoley@msu.edu> | 2003-04-30 23:23:59 +0800 |
|---|---|---|
| committer | Dave Bordoley <Bordoley@src.gnome.org> | 2003-04-30 23:23:59 +0800 |
| commit | 6a6479ca2b2c1fd5aa78c860299d1a96ef51f199 (patch) | |
| tree | 7d3872e012507702383a587ebc8a000f5969be6d /src/ephy-window.c | |
| parent | 4060d7d5d6a9c6199515e9c059faf43d53b02e44 (diff) | |
| download | gsoc2013-epiphany-6a6479ca2b2c1fd5aa78c860299d1a96ef51f199.tar gsoc2013-epiphany-6a6479ca2b2c1fd5aa78c860299d1a96ef51f199.tar.gz gsoc2013-epiphany-6a6479ca2b2c1fd5aa78c860299d1a96ef51f199.tar.bz2 gsoc2013-epiphany-6a6479ca2b2c1fd5aa78c860299d1a96ef51f199.tar.lz gsoc2013-epiphany-6a6479ca2b2c1fd5aa78c860299d1a96ef51f199.tar.xz gsoc2013-epiphany-6a6479ca2b2c1fd5aa78c860299d1a96ef51f199.tar.zst gsoc2013-epiphany-6a6479ca2b2c1fd5aa78c860299d1a96ef51f199.zip | |
src/ephy-window.c data/epiphany.schemas.in
2003-04-30 David Bordoley <bordoley@msu.edu>
* 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 <lwillis@plus.net>
Diffstat (limited to 'src/ephy-window.c')
| -rw-r--r-- | src/ephy-window.c | 41 |
1 files changed, 12 insertions, 29 deletions
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; } } |