diff options
| author | Bastien Nocera <hadess@hadess.net> | 2014-04-13 15:02:29 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2014-04-13 15:05:16 +0200 |
| commit | 891aec3e1b8672f71ea2fe28614feed6b03b1b02 (patch) | |
| tree | b7a7f1c95b28bc60a06bc2e6ce66bca1280acb18 | |
| parent | ffefe928c08a9b7d9bf96087a97d930b0e5cc4ce (diff) | |
| download | totem-891aec3e1b8672f71ea2fe28614feed6b03b1b02.tar.gz | |
main: Block popup hiding when "Go" popover is shown
When the "Go" button is toggled on and the menu is shown, block
hiding the popup.
| -rw-r--r-- | src/totem-object.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/totem-object.c b/src/totem-object.c index 276370145..6e9286354 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -3425,13 +3425,13 @@ totem_setup_window (TotemObject *totem) } static void -fullscreen_menu_shown_cb (GtkToggleButton *button, - TotemObject *totem) +popup_menu_shown_cb (GtkToggleButton *button, + TotemObject *totem) { if (gtk_toggle_button_get_active (button)) - bacon_video_widget_mark_popup_busy (totem->bvw, "toolbar menu visible"); + bacon_video_widget_mark_popup_busy (totem->bvw, "toolbar/go menu visible"); else - bacon_video_widget_unmark_popup_busy (totem->bvw, "toolbar menu visible"); + bacon_video_widget_unmark_popup_busy (totem->bvw, "toolbar/go menu visible"); } static gboolean @@ -3544,7 +3544,8 @@ totem_callback_connect (TotemObject *totem) item = g_object_get_data (totem->controls, "go_button"); menu = (GMenuModel *) gtk_builder_get_object (totem->xml, "gomenu"); gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (item), menu); - + g_signal_connect (G_OBJECT (item), "toggled", + G_CALLBACK (popup_menu_shown_cb), totem); /* Cog wheel */ item = totem->gear_button = totem_interface_create_header_button (totem->header, gtk_menu_button_new (), @@ -3554,7 +3555,7 @@ totem_callback_connect (TotemObject *totem) menu = (GMenuModel *) gtk_builder_get_object (totem->xml, "playermenu"); gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (item), menu); g_signal_connect (G_OBJECT (item), "toggled", - G_CALLBACK (fullscreen_menu_shown_cb), totem); + G_CALLBACK (popup_menu_shown_cb), totem); /* Add button */ item = totem->add_button = totem_interface_create_header_button (totem->header, @@ -3716,7 +3717,7 @@ add_fullscreen_toolbar (TotemObject *totem) menu = (GMenuModel *) gtk_builder_get_object (totem->xml, "playermenu"); gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (item), menu); g_signal_connect (G_OBJECT (item), "toggled", - G_CALLBACK (fullscreen_menu_shown_cb), totem); + G_CALLBACK (popup_menu_shown_cb), totem); totem->fullscreen_gear_button = item; item = totem_interface_create_header_button (totem->fullscreen_header, |