[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52967] trunk/blender/source/blender/ editors/interface/interface_panel.c: Only LMB clicks in Panel should return "handled" - it accidentally returned it for

Ton Roosendaal ton at blender.org
Thu Dec 13 11:58:02 CET 2012


Revision: 52967
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52967
Author:   ton
Date:     2012-12-13 10:58:00 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
Only LMB clicks in Panel should return "handled" - it accidentally returned it for
mousewheel too. 

Previous commit made scrolling in button regions not work.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_panel.c

Modified: trunk/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_panel.c	2012-12-13 10:51:38 UTC (rev 52966)
+++ trunk/blender/source/blender/editors/interface/interface_panel.c	2012-12-13 10:58:00 UTC (rev 52967)
@@ -1157,27 +1157,31 @@
 
 			if (event->val == KM_PRESS) {
 				
-				/* all inside clicks should return in break - overlapping/float panels */
-				retval = WM_UI_HANDLER_BREAK;
-
 				/* open close on header */
 				if (ELEM(event->type, RETKEY, PADENTER)) {
 					if (inside_header) {
 						ui_handle_panel_header(C, block, mx, my, RETKEY);
+						retval = WM_UI_HANDLER_BREAK;
 						break;
 					}
 				}
 				else if (event->type == LEFTMOUSE) {
+					/* all inside clicks should return in break - overlapping/float panels */
+					retval = WM_UI_HANDLER_BREAK;
+					
 					if (inside_header) {
 						if (event->ctrl)
 							panels_collapse_all(sa, ar);
 						ui_handle_panel_header(C, block, mx, my, 0);
+						retval = WM_UI_HANDLER_BREAK;
 						break;
 					}
 					else if (inside_scale && !(pa->flag & PNL_CLOSED)) {
 						panel_activate_state(C, pa, PANEL_STATE_DRAG_SCALE);
+						retval = WM_UI_HANDLER_BREAK;
 						break;
 					}
+
 				}
 				else if (event->type == ESCKEY) {
 					/*XXX 2.50*/




More information about the Bf-blender-cvs mailing list