diff options
| author | Jan-Michael Brummer <jan.brummer@tabos.org> | 2022-12-27 23:49:37 +0100 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2023-01-04 23:06:13 +0000 |
| commit | 048d520594c21aaaf21be900ead85e3305074798 (patch) | |
| tree | 0c636c49ddcd6348c766819377f70229a6e03cc8 | |
| parent | e88d44e46676fee53446b6096d82c37526b4ff2f (diff) | |
| download | epiphany-048d520594c21aaaf21be900ead85e3305074798.tar.gz | |
Always show "Mute tab" in context menu
Fixes: https://gitlab.gnome.org/GNOME/epiphany/-/issues/1934
Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1246>
| -rw-r--r-- | src/ephy-window.c | 13 | ||||
| -rw-r--r-- | src/resources/gtk/notebook-context-menu.ui | 1 | ||||
| -rw-r--r-- | src/window-commands.c | 3 |
3 files changed, 0 insertions, 17 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index 21f88a71b..49521c18a 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -2533,25 +2533,18 @@ tab_view_setup_menu_cb (AdwTabView *tab_view, AdwTabPage *page, EphyWindow *window) { - EphyWebView *view; GActionGroup *action_group; GAction *action; int n_pages; int n_pinned_pages; int position; gboolean pinned; - gboolean audio_playing; - gboolean muted; if (page) { n_pages = adw_tab_view_get_n_pages (tab_view); n_pinned_pages = adw_tab_view_get_n_pinned_pages (tab_view); position = adw_tab_view_get_page_position (tab_view, page); pinned = adw_tab_page_get_pinned (page); - - view = ephy_embed_get_web_view (EPHY_EMBED (adw_tab_page_get_child (page))); - audio_playing = webkit_web_view_is_playing_audio (WEBKIT_WEB_VIEW (view)); - muted = webkit_web_view_get_is_muted (WEBKIT_WEB_VIEW (view)); } action_group = ephy_window_get_action_group (window, "tab"); @@ -2583,12 +2576,6 @@ tab_view_setup_menu_cb (AdwTabView *tab_view, g_simple_action_set_enabled (G_SIMPLE_ACTION (action), !page || pinned); action = g_action_map_lookup_action (G_ACTION_MAP (action_group), - "mute"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), !page || audio_playing); - g_simple_action_set_state (G_SIMPLE_ACTION (action), - g_variant_new_boolean (!page || muted)); - - action = g_action_map_lookup_action (G_ACTION_MAP (action_group), "close"); g_simple_action_set_enabled (G_SIMPLE_ACTION (action), !page || !pinned); } diff --git a/src/resources/gtk/notebook-context-menu.ui b/src/resources/gtk/notebook-context-menu.ui index 8e5ebc981..d868cfcda 100644 --- a/src/resources/gtk/notebook-context-menu.ui +++ b/src/resources/gtk/notebook-context-menu.ui @@ -30,7 +30,6 @@ <item> <attribute name="label" translatable="yes">_Mute Tab</attribute> <attribute name="action">tab.mute</attribute> - <attribute name="hidden-when">action-disabled</attribute> </item> </section> <section> diff --git a/src/window-commands.c b/src/window-commands.c index 5f04827e7..a5702da74 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -2999,9 +2999,6 @@ window_cmd_change_tabs_mute_state (GSimpleAction *action, view = ephy_embed_get_web_view (embed); - if (!webkit_web_view_is_playing_audio (WEBKIT_WEB_VIEW (view))) - return; - mute = !webkit_web_view_get_is_muted (WEBKIT_WEB_VIEW (view)); webkit_web_view_set_is_muted (WEBKIT_WEB_VIEW (view), mute); |