summaryrefslogtreecommitdiff
path: root/mate-panel/panel-menu-button.c
diff options
context:
space:
mode:
Diffstat (limited to 'mate-panel/panel-menu-button.c')
-rw-r--r--mate-panel/panel-menu-button.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/mate-panel/panel-menu-button.c b/mate-panel/panel-menu-button.c
index b111edff..1574d2f3 100644
--- a/mate-panel/panel-menu-button.c
+++ b/mate-panel/panel-menu-button.c
@@ -26,9 +26,12 @@
#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>
@@ -92,6 +95,8 @@ struct _PanelMenuButtonPrivate {
char *custom_icon;
char *tooltip;
+ Window interrupted_window;
+
MenuPathRoot path_root;
guint use_menu_path : 1;
guint use_custom_icon : 1;
@@ -424,12 +429,23 @@ 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);
+ panel_util_set_current_active_window(toplevel, button->priv->interrupted_window);
+ button->priv->interrupted_window = None;
+
+ 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));
@@ -449,6 +465,12 @@ panel_menu_button_popup_menu (PanelMenuButton *button,
GTK_WIDGET (button),
n_button,
activate_time);
+
+ 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));
+ button->priv->interrupted_window = panel_util_get_current_active_window (toplevel);
+ window = gtk_widget_get_window (toplevel);
+ panel_util_set_current_active_window (toplevel, GDK_WINDOW_XID(window));
}
static void