diff options
author | Ton Roosendaal <ton@blender.org> | 2013-01-08 18:40:15 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2013-01-08 18:40:15 +0400 |
commit | 472595f1d3533f143bdc84700b26f20a7b2ba1c1 (patch) | |
tree | da75bb34a2707f55173e2e456c24f08cb036ccd2 /source/blender/windowmanager | |
parent | e62bc29a9b5a4bb69547bb565e9793fca6df5b76 (diff) |
Bugfix #33803
(2.65a and older)
Case: ALT+CTRL+U (user prefs) made mousewheel change button values in inactive
window.
On opening 2nd window, or de-activating a window, the modifier
state was kept for that window. That meant that mouse-over in a window was using
the old modifier - for example for scrollwheel it would change values
in buttons.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index ec94501c8be..9e0f8613a1a 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -701,6 +701,14 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr C_void_ptr case GHOST_kEventWindowDeactivate: wm_event_add_ghostevent(wm, win, type, time, data); win->active = 0; /* XXX */ + + /* clear modifiers for inactive windows */ + win->eventstate->alt = 0; + win->eventstate->ctrl = 0; + win->eventstate->shift = 0; + win->eventstate->oskey = 0; + win->eventstate->keymodifier = 0; + break; case GHOST_kEventWindowActivate: { |