Revision: 17743
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17743
Author: aligorith
Date: 2008-12-08 01:48:27 +0100 (Mon, 08 Dec 2008)
Log Message:
-----------
View2D: Tweaks to make handles work better with no-clamping of bubble
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
2008-12-08 00:40:27 UTC (rev 17742)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
2008-12-08 00:48:27 UTC (rev 17743)
@@ -875,9 +875,14 @@
{
short in_min, in_max;
- /* firstly, check if 'bubble' fills entire scroller */
- // XXX this isn't so good for anim-editors...
- if ((sh_min <= sc_min) && (sh_max >= sc_max)) {
+ /* firstly, check if
+ * - 'bubble' fills entire scroller
+ * - 'bubble' completely out of view on either side
+ */
+ if ( ((sh_min <= sc_min) && (sh_max >= sc_max)) ||
+ ((sh_min <= sc_min) && (sh_max <= sc_max)) ||
+ ((sh_min >= sc_max) && (sh_max >= sc_max)) )
+ {
/* use midpoint to determine which handle to use (favour 'max'
handle) */
if (mouse >= ((sc_max + sc_min) / 2))
return SCROLLHANDLE_MAX;
@@ -1157,7 +1162,7 @@
{
ui_view2d_operatortypes();
- /* pan/scroll operators */
+ /* pan/scroll */
WM_keymap_add_item(&wm->view2dkeymap, "ED_View2D_OT_view_pan",
MIDDLEMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(&wm->view2dkeymap, "ED_View2D_OT_view_rightscroll",
WHEELDOWNMOUSE, KM_ANY, KM_CTRL, 0);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
