Attachment 908108 Details for Bug 1108706 – Replacement for window-dragging patch

[patch] Replacement for window-dragging patch

window-dragging-2.patch (text/plain), 4.37 KB, created by Ron Yorston on 2014-06-12 12:56:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ron Yorston

Created: 2014-06-12 12:56:39 UTC

Size: 4.37 KB

patch

obsolete

>diff -up gtk2-2.20.1/gtk/gtkmenushell.c.window-dragging-2 gtk2-2.20.1/gtk/gtkmenushell.c
>--- gtk2-2.20.1/gtk/gtkmenushell.c.window-dragging-2	2010-05-03 02:51:45.000000000 +0100
>+++ gtk2-2.20.1/gtk/gtkmenushell.c	2014-06-12 11:43:22.416999540 +0100
>@@ -589,18 +589,45 @@ gtk_menu_shell_button_press (GtkWidget  
> 
>   if (!menu_shell->active || !menu_shell->button)
>     {
>-      _gtk_menu_shell_activate (menu_shell);
>+      gboolean initially_active = menu_shell->active;
> 
>       menu_shell->button = event->button;
> 
>-      if (menu_item && _gtk_menu_item_is_selectable (menu_item) &&
>-	  menu_item->parent == widget &&
>-          menu_item != menu_shell->active_menu_item)
>+      if (menu_item)
>         {
>-          if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM)
>+          _gtk_menu_shell_activate (menu_shell);
>+          if (_gtk_menu_item_is_selectable (menu_item) &&
>+              menu_item->parent == widget &&
>+              menu_item != menu_shell->active_menu_item)
>             {
>-              menu_shell->activate_time = event->time;
>-              gtk_menu_shell_select_item (menu_shell, menu_item);
>+              menu_shell->button = event->button;
>+
>+              if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM)
>+                {
>+                  menu_shell->activate_time = event->time;
>+                  gtk_menu_shell_select_item (menu_shell, menu_item);
>+                }
>+            }
>+        }
>+      else
>+        {
>+          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);
>+                }
>             }
>         }
>     }
>diff -up gtk2-2.20.1/gtk/gtktoolbar.c.window-dragging-2 gtk2-2.20.1/gtk/gtktoolbar.c
>--- gtk2-2.20.1/gtk/gtktoolbar.c.window-dragging-2	2010-05-03 02:51:45.000000000 +0100
>+++ gtk2-2.20.1/gtk/gtktoolbar.c	2014-06-12 11:42:34.247004747 +0100
>@@ -2699,17 +2699,41 @@ static gboolean
> gtk_toolbar_button_press (GtkWidget      *toolbar,
>     			  GdkEventButton *event)
> {
>+  GtkWidget *window;
>+
>   if (event->button == 3)
>     {
>       gboolean return_value;
>-      
>+
>       g_signal_emit (toolbar, toolbar_signals[POPUP_CONTEXT_MENU], 0,
> 		     (int)event->x_root, (int)event->y_root, event->button,
> 		     &return_value);
>-      
>+
>       return return_value;
>     }
>-  
>+
>+  window = gtk_widget_get_toplevel (toolbar);
>+
>+  if (window)
>+    {
>+      gboolean window_drag = FALSE;
>+
>+      gtk_widget_style_get (toolbar,
>+                            "window-dragging", &window_drag,
>+                            NULL);
>+
>+      if (window_drag)
>+        {
>+          gtk_window_begin_move_drag (GTK_WINDOW (window),
>+                                      event->button,
>+                                      event->x_root,
>+                                      event->y_root,
>+                                      event->time);
>+
>+          return TRUE;
>+        }
>+    }
>+
>   return FALSE;
> }
> 
>diff -up gtk2-2.20.1/gtk/gtkwidget.c.window-dragging-2 gtk2-2.20.1/gtk/gtkwidget.c
>--- gtk2-2.20.1/gtk/gtkwidget.c.window-dragging-2	2010-05-03 02:51:45.000000000 +0100
>+++ gtk2-2.20.1/gtk/gtkwidget.c	2014-06-12 11:42:34.250004527 +0100
>@@ -2444,6 +2444,13 @@ gtk_widget_class_init (GtkWidgetClass *k
> 							       0.0, 1.0, 0.04,
> 							       GTK_PARAM_READABLE));
> 
>+  gtk_widget_class_install_style_property (klass,
>+                                           g_param_spec_boolean ("window-dragging",
>+                                                                 P_("Window dragging"),
>+                                                                 P_("Window dragging"),
>+                                                                 FALSE,
>+                                                                 GTK_PARAM_READWRITE));
>+
>   /**
>    * GtkWidget:draw-border:
>    *

Actions: View | Diff

Attachments on bug 1108706: 908108