griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

View2D: Tweaks to make handles work better with no-clamping of bubble

Browse Source
This commit is contained in:
Joshua Leung
2008-12-08 00:48:27 +00:00
parent af52f24fe4
commit 11e15bf689
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/interface/view2d_ops.c
View File

@@ -875,9 +875,14 @@ static short mouse_in_scroller_handle(int mouse, int sc_min, int sc_max, int sh_
{
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 @@ void UI_view2d_keymap(wmWindowManager *wm)
{
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);