[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17756] branches/blender2.5/blender/source /blender/editors: 2. 5 - Swapped order for adding View2D keymaps in TimeLine so that they can still work .
Joshua Leung
aligorith at gmail.com
Tue Dec 9 07:23:41 CET 2008
Revision: 17756
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17756
Author: aligorith
Date: 2008-12-09 07:23:40 +0100 (Tue, 09 Dec 2008)
Log Message:
-----------
2.5 - Swapped order for adding View2D keymaps in TimeLine so that they can still work.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
branches/blender2.5/blender/source/blender/editors/space_time/space_time.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-09 04:57:42 UTC (rev 17755)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c 2008-12-09 06:23:40 UTC (rev 17756)
@@ -209,8 +209,6 @@
RNA_int_set(op->ptr, "deltax", 0);
RNA_int_set(op->ptr, "deltay", 0);
- vpd->in_scroller= mouse_in_v2d_scrollers(C, v2d, event->x, event->y);
-
#if 0 // XXX - enable this when cursors are working properly
if (v2d->keepofs & V2D_LOCKOFS_X)
WM_set_cursor(C, BC_NS_SCROLLCURSOR);
@@ -236,20 +234,8 @@
case MOUSEMOVE:
{
/* calculate new delta transform, then store mouse-coordinates for next-time */
- switch (vpd->in_scroller) {
- case 'h': /* horizontal scrollbar - so only horizontal scroll (inverse direction) */
- RNA_int_set(op->ptr, "deltax", (event->x - vpd->lastx));
- RNA_int_set(op->ptr, "deltay", 0);
- break;
- case 'v': /* vertical scrollbar - so only vertical scroll (inverse direction) */
- RNA_int_set(op->ptr, "deltax", 0);
- RNA_int_set(op->ptr, "deltay", (event->y - vpd->lasty));
- break;
- default:
- RNA_int_set(op->ptr, "deltax", (vpd->lastx - event->x));
- RNA_int_set(op->ptr, "deltay", (vpd->lasty - event->y));
- break;
- }
+ RNA_int_set(op->ptr, "deltax", (vpd->lastx - event->x));
+ RNA_int_set(op->ptr, "deltay", (vpd->lasty - event->y));
vpd->lastx= event->x;
vpd->lasty= event->y;
@@ -261,20 +247,8 @@
case MIDDLEMOUSE:
if (event->val==0) {
/* calculate overall delta mouse-movement for redo */
- switch (vpd->in_scroller) {
- case 'h': /* horizontal scrollbar - so only horizontal scroll (inverse direction) */
- RNA_int_set(op->ptr, "deltax", (vpd->lastx - vpd->startx));
- RNA_int_set(op->ptr, "deltay", 0);
- break;
- case 'v': /* vertical scrollbar - so only vertical scroll (inverse direction) */
- RNA_int_set(op->ptr, "deltax", 0);
- RNA_int_set(op->ptr, "deltay", (vpd->lasty - vpd->starty));
- break;
- default:
- RNA_int_set(op->ptr, "deltax", (vpd->startx - vpd->lastx));
- RNA_int_set(op->ptr, "deltay", (vpd->starty - vpd->lasty));
- break;
- }
+ RNA_int_set(op->ptr, "deltax", (vpd->startx - vpd->lastx));
+ RNA_int_set(op->ptr, "deltay", (vpd->starty - vpd->lasty));
view_pan_exit(C, op);
//WM_set_cursor(C, CURSOR_STD); // XXX - enable this when cursors are working properly
Modified: branches/blender2.5/blender/source/blender/editors/space_time/space_time.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_time/space_time.c 2008-12-09 04:57:42 UTC (rev 17755)
+++ branches/blender2.5/blender/source/blender/editors/space_time/space_time.c 2008-12-09 06:23:40 UTC (rev 17756)
@@ -256,10 +256,10 @@
WM_event_add_keymap_handler(&ar->handlers, keymap);
/* own keymap */
- keymap= WM_keymap_listbase(wm, "TimeLine", sa->spacetype, 0);
+ keymap= WM_keymap_listbase(wm, "View2D", 0, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
- keymap= WM_keymap_listbase(wm, "View2D", 0, 0);
+ keymap= WM_keymap_listbase(wm, "TimeLine", sa->spacetype, 0);
WM_event_add_keymap_handler(&ar->handlers, keymap);
}
}
More information about the Bf-blender-cvs
mailing list