diff options
| author | Alexander Mikhaylenko <alexm@gnome.org> | 2021-03-14 23:18:52 +0500 |
|---|---|---|
| committer | Alexander Mikhaylenko <alexm@gnome.org> | 2021-03-26 13:08:24 +0500 |
| commit | 0fa4cf9068d84a759bc4a755cc5c496aba05d05a (patch) | |
| tree | f8ae1dba90d8a2e941ac4f2bc01178c1cfbf917b | |
| parent | adeb59da5ae7d177a3bb7016bc27990e851b82ee (diff) | |
| download | epiphany-wip/exalm/fullscreen-newtab.tar.gz | |
action-bar-start: Don't hide new tab button in fullscreenwip/exalm/fullscreen-newtab
Since we show tabs now, the button should be visible too.
| -rw-r--r-- | src/ephy-action-bar-start.c | 16 | ||||
| -rw-r--r-- | src/ephy-action-bar-start.h | 2 | ||||
| -rw-r--r-- | src/ephy-header-bar.c | 1 |
3 files changed, 1 insertions, 18 deletions
diff --git a/src/ephy-action-bar-start.c b/src/ephy-action-bar-start.c index 135e6ebe0..2cb1955d9 100644 --- a/src/ephy-action-bar-start.c +++ b/src/ephy-action-bar-start.c @@ -49,7 +49,6 @@ struct _EphyActionBarStart { GtkWidget *placeholder; guint navigation_buttons_menu_timeout; - gboolean is_fullscreen; }; G_DEFINE_TYPE (EphyActionBarStart, ephy_action_bar_start, GTK_TYPE_BOX) @@ -503,8 +502,7 @@ update_new_tab_button_visibility (EphyActionBarStart *action_bar_start) gtk_widget_set_visible (action_bar_start->new_tab_button, (ephy_embed_shell_get_mode (embed_shell) != EPHY_EMBED_SHELL_MODE_APPLICATION) && - !is_desktop_pantheon () && - !action_bar_start->is_fullscreen); + !is_desktop_pantheon ()); } static void @@ -617,7 +615,6 @@ ephy_action_bar_start_class_init (EphyActionBarStartClass *klass) static void ephy_action_bar_start_init (EphyActionBarStart *action_bar_start) { - action_bar_start->is_fullscreen = FALSE; } EphyActionBarStart * @@ -653,17 +650,6 @@ ephy_action_bar_start_change_combined_stop_reload_state (EphyActionBarStart *act } } -void -ephy_action_bar_set_is_fullscreen (EphyActionBarStart *action_bar_start, - gboolean fullscreen) -{ - if (action_bar_start->is_fullscreen == fullscreen) - return; - - action_bar_start->is_fullscreen = fullscreen; - update_new_tab_button_visibility (action_bar_start); -} - GtkWidget * ephy_action_bar_start_get_placeholder (EphyActionBarStart *action_bar_start) { diff --git a/src/ephy-action-bar-start.h b/src/ephy-action-bar-start.h index 1a4c106a9..ee6b20703 100644 --- a/src/ephy-action-bar-start.h +++ b/src/ephy-action-bar-start.h @@ -35,8 +35,6 @@ EphyActionBarStart *ephy_action_bar_start_new (voi GtkWidget *ephy_action_bar_start_get_navigation_box (EphyActionBarStart *action_bar_start); void ephy_action_bar_start_change_combined_stop_reload_state (EphyActionBarStart *action_bar_start, gboolean loading); -void ephy_action_bar_set_is_fullscreen (EphyActionBarStart *action_bar_start, - gboolean fullscreen); GtkWidget *ephy_action_bar_start_get_placeholder (EphyActionBarStart *action_bar_start); void ephy_action_bar_start_set_adaptive_mode (EphyActionBarStart *action_bar, diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c index 4d8e41176..057f4c696 100644 --- a/src/ephy-header-bar.c +++ b/src/ephy-header-bar.c @@ -140,7 +140,6 @@ fullscreen_changed_cb (EphyHeaderBar *header_bar) gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header_bar), !fullscreen); gtk_widget_set_visible (header_bar->restore_button, fullscreen); - ephy_action_bar_set_is_fullscreen (header_bar->action_bar_start, fullscreen); if (fullscreen) { g_clear_handle_id (&header_bar->popover_hide_timeout_id, g_source_remove); |