Revision: 33928
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33928
Author: jesterking
Date: 2010-12-28 14:03:38 +0100 (Tue, 28 Dec 2010)
Log Message:
-----------
Fix [#24630] alt+shift+LMB dragging does not work
Reported by Nils Austa
There was double handling of modifier keys. With my autumn work on the modifier
keys I had moved state checks for
modifier keys into convertKey(), but left the call to handleModifierKeys. That
caused problems with proper
modifier key handling in the entire key handling code of GHOST.
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2010-12-28
11:56:18 UTC (rev 33927)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2010-12-28
13:03:38 UTC (rev 33928)
@@ -488,11 +488,6 @@
system->retrieveModifierKeys(oldModifiers);
system->getModifierKeys(newModifiers);
- // check if modifier keys different from this event have changed and
trigger those
- // This can happen when some action takes a long time (Blender not
responding), resulting
- // in dropped events.
- system->handleModifierKeys(window, wParam, lParam, oldModifiers,
newModifiers);
-
//std::cout << wParam << " " << system->m_curKeyStatus[wParam] << "
shift pressed: " << system->shiftPressed() << std::endl;
if ((wParam >= '0') && (wParam <= '9')) {
@@ -777,12 +772,13 @@
KBDLLHOOKSTRUCT &keyb = *(PKBDLLHOOKSTRUCT)(lParam);
system->m_prevKeyStatus[keyb.vkCode] =
system->m_curKeyStatus[keyb.vkCode];
- //std::cout << "ll: " << keyb.vkCode << " " << down << " ";
+ //std::cout << "ll: " << keyb.vkCode << " " << down << " ||| ";
if(keyb.flags) {
if((keyb.flags & LLKHF_EXTENDED) == LLKHF_EXTENDED) {
//std::cout << "extended ";
}
if((keyb.flags & LLKHF_ALTDOWN) == LLKHF_ALTDOWN) {
+ //std::cout << "alt ";
}
if((keyb.flags & LLKHF_INJECTED)== LLKHF_INJECTED) {
//std::cout << "injected ";
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
