[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53700] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: Bug fix 33732

Ton Roosendaal ton at blender.org
Thu Jan 10 12:08:39 CET 2013


Revision: 53700
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53700
Author:   ton
Date:     2013-01-10 11:08:38 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Bug fix 33732

Modal operators with hardcoded (in C) event handling now don't get
double clicks anymore. For modal keymaps things work OK.

This fixes number input typing for CTRL+B bevel, for example.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-01-10 10:10:34 UTC (rev 53699)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-01-10 11:08:38 UTC (rev 53700)
@@ -1345,6 +1345,15 @@
 			}
 		}
 	}
+	else {
+		/* modal keymap checking returns handled events fine, but all hardcoded modal
+		   handling typically swallows all events (OPERATOR_RUNNING_MODAL).
+		   This bypass just disables support for double clicks in hardcoded modal handlers */
+		if (event->val == KM_DBL_CLICK) {
+			event->prevval = event->val;
+			event->val = KM_PRESS;
+		}
+	}
 }
 
 /* bad hacking event system... better restore event type for checking of KM_CLICK for example */
@@ -1357,6 +1366,8 @@
 		event->val = event->prevval;
 		event->prevval = 0;
 	}
+	else if (event->prevval == KM_DBL_CLICK)
+		event->val = KM_DBL_CLICK;
 
 }
 




More information about the Bf-blender-cvs mailing list