[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43962] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Fix #30076: RenderLayer area blocks mouse scrolling

Sergey Sharybin sergey.vfx at gmail.com
Tue Feb 7 17:53:16 CET 2012


Revision: 43962
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43962
Author:   nazgul
Date:     2012-02-07 16:53:14 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Fix #30076: RenderLayer area blocks mouse scrolling

In fact all list templates used to block mouse scroll. It's because mouse
scrolls list's scroll bar. But mouse scroll also used to be "eaten" even
if there's no scroll in list template.
This commit makes scroll even be ignored by list templates if there's
no scroll bar on list.

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

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-02-07 16:45:05 UTC (rev 43961)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-02-07 16:53:14 UTC (rev 43962)
@@ -5859,15 +5859,17 @@
 			retval= WM_UI_HANDLER_BREAK;
 		}
 		else if(ELEM(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE)) {
-			/* list template will clamp */
-			if(event->type == WHEELUPMOUSE)
-				pa->list_scroll--;
-			else
-				pa->list_scroll++;
+			if(pa->list_last_len > pa->list_size) {
+				/* list template will clamp */
+				if(event->type == WHEELUPMOUSE)
+					pa->list_scroll--;
+				else
+					pa->list_scroll++;
 
-			ED_region_tag_redraw(ar);
+				ED_region_tag_redraw(ar);
 
-			retval= WM_UI_HANDLER_BREAK;
+				retval= WM_UI_HANDLER_BREAK;
+			}
 		}
 	}
 




More information about the Bf-blender-cvs mailing list