menushell/toolbar/window: implement toggle maximize on double click

https://bugzilla.gnome.org/show_bug.cgi?id=700419

1 files changed, 6 insertions, 15 deletions

diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 3d3bc5e906..97efed3cdf 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -70,6 +70,7 @@
 #include "gtkmenushellprivate.h"
 #include "gtkmnemonichash.h"
 #include "gtkwindow.h"
+#include "gtkwindowprivate.h"
 #include "gtkprivate.h"
 #include "gtkmain.h"
 #include "gtkintl.h"
@@ -646,6 +647,9 @@ gtk_menu_shell_button_press (GtkWidget      *widget,
   GtkWidget *menu_item;
   GtkWidget *parent;
 
+  if (event->type == GDK_2BUTTON_PRESS)
+    return _gtk_window_handle_button_press_for_widget (widget, event);
+
   if (event->type != GDK_BUTTON_PRESS)
     return FALSE;
 
@@ -701,21 +705,8 @@ gtk_menu_shell_button_press (GtkWidget      *widget,
         {
           if (!initially_active)
             {
-              gboolean window_drag = FALSE;
-
-              gtk_widget_style_get (widget,
-                                    "window-dragging", &window_drag,
-                                    NULL);
-
-              if (window_drag)
-                {
-                  gtk_menu_shell_deactivate (menu_shell);
-                  gtk_window_begin_move_drag (GTK_WINDOW (gtk_widget_get_toplevel (widget)),
-                                              event->button,
-                                              event->x_root,
-                                              event->y_root,
-                                              event->time);
-                }
+              if (_gtk_window_handle_button_press_for_widget (widget, event))
+                gtk_menu_shell_deactivate (menu_shell);
             }
         }
     }