metacity r3942 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Mon Oct  6 01:34:17 2008
New Revision: 3942
URL: http://svn.gnome.org/viewvc/metacity?rev=3942&view=rev

Log:
2008-10-06  William Lachance  <wrlach gmail com>

        Pass modified mouse button events down to panel windows
        instead of dealing with them ourselves.  Closes #554428.

        * src/core/display.c (prefs_changed_callback): don't grab mouse
          buttons on panels
        * src/core/window.c (meta_window_new_with_attrs): ditto



Modified:
   trunk/ChangeLog
   trunk/src/core/display.c
   trunk/src/core/window.c

Modified: trunk/src/core/display.c
==============================================================================
--- trunk/src/core/display.c	(original)
+++ trunk/src/core/display.c	Mon Oct  6 01:34:17 2008
@@ -4920,8 +4920,11 @@
       while (tmp != NULL)
         {
           MetaWindow *w = tmp->data;
-          meta_display_grab_focus_window_button (display, w);
-          meta_display_grab_window_buttons (display, w->xwindow);
+          if (w->type != META_WINDOW_DOCK)
+            {
+              meta_display_grab_focus_window_button (display, w);
+              meta_display_grab_window_buttons (display, w->xwindow);
+            }
           tmp = tmp->next;
         }
 

Modified: trunk/src/core/window.c
==============================================================================
--- trunk/src/core/window.c	(original)
+++ trunk/src/core/window.c	Mon Oct  6 01:34:17 2008
@@ -659,8 +659,11 @@
     meta_window_ensure_frame (window);
 
   meta_window_grab_keys (window);
-  meta_display_grab_window_buttons (window->display, window->xwindow);
-  meta_display_grab_focus_window_button (window->display, window);
+  if (window->type != META_WINDOW_DOCK)
+    {
+      meta_display_grab_window_buttons (window->display, window->xwindow);
+      meta_display_grab_focus_window_button (window->display, window);
+    }
 
   if (window->type == META_WINDOW_DESKTOP ||
       window->type == META_WINDOW_DOCK)