diff options
| author | raveit65 <[email protected]> | 2019-06-03 19:56:29 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-06-07 15:27:21 +0200 |
| commit | 894645c7bce5a4f554976ab48f66293bf9fd70cc (patch) | |
| tree | 3cbb8d1e4d915f3cc1d1acec75da608aa905605d /mate-panel/panel-menu-button.c | |
| parent | a9e608411f519b5cb1bc268f7384dc8449221d4f (diff) | |
| download | mate-panel-894645c7bce5a4f554976ab48f66293bf9fd70cc.tar.bz2 mate-panel-894645c7bce5a4f554976ab48f66293bf9fd70cc.tar.xz | |
revert menu-bar: transfer focus correctly on alt-F1
This revert
https://github.com/mate-desktop/mate-panel/commit/f0f4c5e
and fixes hopefully https://github.com/mate-desktop/marco/issues/209
Diffstat (limited to 'mate-panel/panel-menu-button.c')
| -rw-r--r-- | mate-panel/panel-menu-button.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/mate-panel/panel-menu-button.c b/mate-panel/panel-menu-button.c index 9b44d795..001ed50a 100644 --- a/mate-panel/panel-menu-button.c +++ b/mate-panel/panel-menu-button.c @@ -26,12 +26,9 @@ #include "panel-menu-button.h" -#include <X11/Xlib.h> - #include <string.h> #include <glib/gi18n.h> #include <gio/gio.h> -#include <gdk/gdkx.h> #include <matemenu-tree.h> @@ -91,10 +88,6 @@ struct _PanelMenuButtonPrivate { char *custom_icon; char *tooltip; -#ifdef HAVE_X11 - Window interrupted_x11_window; -#endif - MenuPathRoot path_root; guint use_menu_path : 1; guint use_custom_icon : 1; @@ -442,28 +435,12 @@ panel_menu_button_recreate_menu (PanelMenuButton *button) button->priv->menu = NULL; } -static gboolean panel_menu_button_menu_deactivate (GtkWidget* widget, PanelMenuButton* button) -{ - GtkWidget *toplevel = gtk_widget_get_toplevel(widget); - -#ifdef HAVE_X11 - if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (widget))) { - panel_util_set_current_active_x11_window(toplevel, button->priv->interrupted_x11_window); - button->priv->interrupted_x11_window = None; - } -#endif - - return FALSE; -} - void panel_menu_button_popup_menu (PanelMenuButton *button, guint n_button, guint32 activate_time) { GdkScreen *screen; - GtkWidget *toplevel; - GdkWindow *window; g_return_if_fail (PANEL_IS_MENU_BUTTON (button)); @@ -489,16 +466,6 @@ panel_menu_button_popup_menu (PanelMenuButton *button, GDK_GRAVITY_NORTH_WEST, GDK_GRAVITY_NORTH_WEST, NULL); - - g_signal_connect(GTK_MENU_SHELL (button->priv->menu), "deactivate", G_CALLBACK (panel_menu_button_menu_deactivate), button); - toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button->priv->toplevel)); - window = gtk_widget_get_window (toplevel); -#ifdef HAVE_X11 - if (GDK_IS_X11_DISPLAY (gdk_window_get_display (window))) { - button->priv->interrupted_x11_window = panel_util_get_current_active_x11_window (toplevel); - panel_util_set_current_active_x11_window (toplevel, GDK_WINDOW_XID(window)); - } -#endif } static void |