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-bar.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-bar.c')
| -rw-r--r-- | mate-panel/panel-menu-bar.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c index b88c6ffb..ae429ba8 100644 --- a/mate-panel/panel-menu-bar.c +++ b/mate-panel/panel-menu-bar.c @@ -28,11 +28,6 @@ #include "panel-menu-bar.h" -#ifdef HAVE_X11 -#include <X11/Xlib.h> -#include <gdk/gdkx.h> -#endif - #include <string.h> #include <glib/gi18n.h> @@ -66,10 +61,6 @@ struct _PanelMenuBarPrivate { GSettings* settings; PanelOrientation orientation; - -#ifdef HAVE_X11 - Window interrupted_x11_window; -#endif }; enum { @@ -90,21 +81,6 @@ static gboolean panel_menu_bar_reinit_tooltip(GtkWidget* widget, PanelMenuBar* m return FALSE; } -static gboolean panel_menu_bar_deactivate (GtkWidget* widget, PanelMenuBar* menubar) -{ - 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, menubar->priv->interrupted_x11_window); - menubar->priv->interrupted_x11_window = None; - } -#endif - - return FALSE; -} - static gboolean panel_menu_bar_hide_tooltip_and_focus(GtkWidget* widget, PanelMenuBar* menubar) { /* remove focus that would be drawn on the currently focused child of @@ -130,7 +106,6 @@ static void panel_menu_bar_setup_tooltip(PanelMenuBar* menubar) /* Reset tooltip when the menu bar is not used */ g_signal_connect(GTK_MENU_SHELL (menubar), "deactivate", G_CALLBACK (panel_menu_bar_reinit_tooltip), menubar); - g_signal_connect(GTK_MENU_SHELL (menubar), "deactivate", G_CALLBACK (panel_menu_bar_deactivate), menubar); } static void panel_menu_bar_update_visibility (GSettings* settings, gchar* key, PanelMenuBar* menubar) @@ -432,22 +407,11 @@ void panel_menu_bar_popup_menu(PanelMenuBar* menubar, guint32 activate_time) { GtkMenu* menu; GtkMenuShell* menu_shell; - GtkWidget* toplevel; - GdkWindow* window; g_return_if_fail(PANEL_IS_MENU_BAR(menubar)); menu = GTK_MENU(menubar->priv->applications_menu); - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (menubar)); - window = gtk_widget_get_window (toplevel); -#ifdef HAVE_X11 - if (GDK_IS_X11_DISPLAY (gdk_window_get_display (window))) { - menubar->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 - /* * We need to call _gtk_menu_shell_activate() here as is done in * window_key_press_handler in gtkmenubar.c which pops up menu |