Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2004-11-01 15:42:03 +0300
committerTon Roosendaal <ton@blender.org>2004-11-01 15:42:03 +0300
commit275c5e7ee346b1629b11d1eaa96550323ccb990a (patch)
treed7ee74ef98aaa7439de013d669411438054dcf80 /source/blender/src/editnla.c
parent84b3980b92ca308192e20f6c6b94b4c4fced08e5 (diff)
Fix for #1722
Reported was that padplus/padminus doesn't do a zoom in the NLA or Action windows. Was missing since very beginning! :) Found conflict with the new NLA strip move up/down, but using the pad keys for that is a bit too inconsistant. I've now made it using the PageUp/PageDown and normal plus/minus keys... Hos could check on this though!
Diffstat (limited to 'source/blender/src/editnla.c')
-rw-r--r--source/blender/src/editnla.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c
index 9838cb68ec2..1a4c776f5f7 100644
--- a/source/blender/src/editnla.c
+++ b/source/blender/src/editnla.c
@@ -218,11 +218,13 @@ void winqreadnlaspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
do_nla_buttons(B_NLAHOME);
break;
- case PADMINUS:
+ case EQUALKEY:
+ case PAGEUPKEY:
shift_nlastrips_up();
break;
- case PADPLUSKEY:
+ case MINUSKEY:
+ case PAGEDOWNKEY:
shift_nlastrips_down();
break;
@@ -321,6 +323,17 @@ void winqreadnlaspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
else
mouse_nlachannels(mval);
break;
+
+ case PADPLUSKEY:
+ view2d_zoom(G.v2d, 0.1154, sa->winx, sa->winy);
+ test_view2d(G.v2d, sa->winx, sa->winy);
+ doredraw= 1;
+ break;
+ case PADMINUS:
+ view2d_zoom(G.v2d, -0.15, sa->winx, sa->winy);
+ test_view2d(G.v2d, sa->winx, sa->winy);
+ doredraw= 1;
+ break;
case MIDDLEMOUSE:
case WHEELUPMOUSE:
case WHEELDOWNMOUSE: