summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Lachance <wrlach@gmail.com>2008-10-06 01:34:17 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-10-06 01:34:17 +0000
commita49f986c67e28b41bda372f18dd0c5ac26a3228e (patch)
tree0b026d2e52cea06204780bedd7479d2d4ebf97d5
parentb1fb765d8e4714020f39238917cb5be3a147f1ae (diff)
downloadmetacity-a49f986c67e28b41bda372f18dd0c5ac26a3228e.tar.gz
Pass modified mouse button events down to panel windows instead of dealing
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 svn path=/trunk/; revision=3942
-rw-r--r--ChangeLog9
-rw-r--r--src/core/display.c7
-rw-r--r--src/core/window.c7
3 files changed, 19 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bbc7f22f..02baa2ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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
+
2008-10-05 Thomas Thurman <tthurman@gnome.org>
Second half of the switch to using x-macros for keybindings so that
diff --git a/src/core/display.c b/src/core/display.c
index d6c44d10..8169541b 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -4920,8 +4920,11 @@ prefs_changed_callback (MetaPreference pref,
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;
}
diff --git a/src/core/window.c b/src/core/window.c
index 2b03b54a..e4bb13b6 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -659,8 +659,11 @@ meta_window_new_with_attrs (MetaDisplay *display,
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)