diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-01-26 23:06:42 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-01-26 23:06:42 +0800 |
| commit | 2e4b61c8058d7405812277b2ac88f37ae642cbf8 (patch) | |
| tree | ca52c37e20c2fa3cff0f28ffb7fa80029886f339 /src/ephy-fullscreen-popup.c | |
| parent | f4052ebd5b307db9adf77f8e61a6badf39c4a7af (diff) | |
| download | gsoc2013-epiphany-2e4b61c8058d7405812277b2ac88f37ae642cbf8.tar gsoc2013-epiphany-2e4b61c8058d7405812277b2ac88f37ae642cbf8.tar.gz gsoc2013-epiphany-2e4b61c8058d7405812277b2ac88f37ae642cbf8.tar.bz2 gsoc2013-epiphany-2e4b61c8058d7405812277b2ac88f37ae642cbf8.tar.lz gsoc2013-epiphany-2e4b61c8058d7405812277b2ac88f37ae642cbf8.tar.xz gsoc2013-epiphany-2e4b61c8058d7405812277b2ac88f37ae642cbf8.tar.zst gsoc2013-epiphany-2e4b61c8058d7405812277b2ac88f37ae642cbf8.zip | |
Don't show the Leave Fullscreen button in lockdown fullscreen mode. Switch
2005-01-26 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-fullscreen-popup.c:
(ephy_fullscreen_popup_update_visibility),
(ephy_fullscreen_popup_set_show_leave),
(ephy_fullscreen_popup_init):
* src/ephy-fullscreen-popup.h:
* src/ephy-toolbar.c: (ephy_toolbar_update_fixed_visibility),
(ephy_toolbar_set_show_leave_fullscreen):
* src/ephy-toolbar.h:
* src/ephy-window.c: (ephy_window_fullscreen),
(ephy_window_unfullscreen):
Don't show the Leave Fullscreen button in lockdown fullscreen mode.
Switch to fullscreen toolbar also in lockdown fullscreen mode.
Fixes bug #165256.
Diffstat (limited to 'src/ephy-fullscreen-popup.c')
| -rw-r--r-- | src/ephy-fullscreen-popup.c | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/src/ephy-fullscreen-popup.c b/src/ephy-fullscreen-popup.c index bf6795cc0..b10a0496d 100644 --- a/src/ephy-fullscreen-popup.c +++ b/src/ephy-fullscreen-popup.c @@ -52,8 +52,9 @@ struct _EphyFullscreenPopupPrivate GtkWidget *lock; GtkWidget *lock_ebox; GtkWidget *button; - gboolean spinning; - gboolean show_lock; + guint show_button : 1; + guint spinning : 1; + guint show_lock : 1; }; enum @@ -99,11 +100,14 @@ static void ephy_fullscreen_popup_update_visibility (EphyFullscreenPopup *popup) { EphyFullscreenPopupPrivate *priv = popup->priv; - gboolean show_frame; + gboolean show_frame, show_sep; show_frame = priv->spinning || priv->show_lock; + show_sep = show_frame && priv->show_button; - g_object_set (priv->sep, "visible", show_frame, NULL); + g_object_set (priv->button, "visible", priv->show_button, + "sensitive", priv->show_button, NULL); + g_object_set (priv->sep, "visible", show_sep, NULL); g_object_set (priv->frame, "visible", show_frame, NULL); g_object_set (priv->spinner, "visible", priv->spinning, NULL); g_object_set (priv->lock_ebox, "visible", priv->show_lock, NULL); @@ -171,6 +175,16 @@ ephy_fullscreen_popup_set_window (EphyFullscreenPopup *popup, /* public functions */ void +ephy_fullscreen_popup_set_show_leave (EphyFullscreenPopup *popup, + gboolean show_button) +{ + EphyFullscreenPopupPrivate *priv = popup->priv; + + priv->show_button = show_button; + ephy_fullscreen_popup_update_visibility (popup); +} + +void ephy_fullscreen_popup_set_spinning (EphyFullscreenPopup *popup, gboolean spinning) { @@ -201,7 +215,11 @@ ephy_fullscreen_popup_set_security_state (EphyFullscreenPopup *popup, static void ephy_fullscreen_popup_init (EphyFullscreenPopup *popup) { - popup->priv = EPHY_FULLSCREEN_POPUP_GET_PRIVATE (popup); + EphyFullscreenPopupPrivate *priv; + + priv = popup->priv = EPHY_FULLSCREEN_POPUP_GET_PRIVATE (popup); + + priv->show_button = TRUE; } static GObject * |