[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33380] trunk/blender/source/blender/ editors: Bugfix #24971

[Ton Roosendaal]

Revision: 33380
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33380
Author:   ton
Date:     2010-11-29 18:10:46 +0100 (Mon, 29 Nov 2010)

Log Message:
-----------
Bugfix #24971

Outliner: if bottom slider was hidden, you still could not click there
on items. Code was using region-mask to clip input, but the mask is not
adjusted for sliders now (keeps view same).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/view2d.c
    trunk/blender/source/blender/editors/interface/view2d_ops.c
    trunk/blender/source/blender/editors/space_outliner/space_outliner.c

Modified: trunk/blender/source/blender/editors/interface/view2d.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d.c	2010-11-29 17:09:33 UTC (rev 33379)
+++ trunk/blender/source/blender/editors/interface/view2d.c	2010-11-29 17:10:46 UTC (rev 33380)
@@ -57,6 +57,9 @@
 
 /* *********************************************************************** */
 
+/* XXX still unresolved: scrolls hide/unhide vs region mask handling */
+/* XXX there's V2D_SCROLL_HORIZONTAL_HIDE and V2D_SCROLL_HORIZONTAL_FULLR ... */
+
 /* helper to allow scrollbars to dynamically hide
  * 	- returns a copy of the scrollbar settings with the flags to display 
  *	  horizontal/vertical scrollbars removed
@@ -83,6 +86,7 @@
 	v2d->mask.ymax= v2d->winy - 1;
 
 #if 0
+	// XXX see above
 	v2d->scroll &= ~(V2D_SCROLL_HORIZONTAL_HIDE|V2D_SCROLL_VERTICAL_HIDE);
 	/* check size if: */
 	if (v2d->scroll & V2D_SCROLL_HORIZONTAL)

Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d_ops.c	2010-11-29 17:09:33 UTC (rev 33379)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c	2010-11-29 17:10:46 UTC (rev 33380)
@@ -1503,7 +1503,7 @@
 			scroller_activate_exit(C, op);
 				
 			/* can't catch this event for ourselves, so let it go to someone else? */
-			// FIXME: still this doesn't fall through to the item_activate callback for the outliner...
+			/* XXX note: if handlers use mask rect to clip input, input will fail for this case */
 			return OPERATOR_PASS_THROUGH;
 		}
 		

Modified: trunk/blender/source/blender/editors/space_outliner/space_outliner.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/space_outliner.c	2010-11-29 17:09:33 UTC (rev 33379)
+++ trunk/blender/source/blender/editors/space_outliner/space_outliner.c	2010-11-29 17:10:46 UTC (rev 33380)
@@ -60,7 +60,8 @@
 	
 	/* own keymap */
 	keymap= WM_keymap_find(wm->defaultconf, "Outliner", SPACE_OUTLINER, 0);
-	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
+	/* don't pass on view2d mask, it's always set with scrollbar space, hide fails */
+	WM_event_add_keymap_handler_bb(&ar->handlers, keymap, NULL, &ar->winrct);
 }
 
 static void outliner_main_area_draw(const bContext *C, ARegion *ar)