summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorAndreas Haas <liu.gam3@gmail.com>2016-09-23 14:57:54 +0200
committerAndreas Haas <liu.gam3@gmail.com>2016-09-23 14:57:54 +0200
commit3cce39c2d37d73124038def2f002cc372ddceb8c (patch)
tree817d0e7b051f5729d6ce4a8d274d3ddcf0d90d3a /tools/editor
parent6fcf2b2bd87e16c9cfc55f3c1293797c24124e85 (diff)
AnimationEditor: zoom using ctrl+wheel
closes #6585
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/animation_editor.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index 2f67df1fc3..a556031e5e 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -1933,12 +1933,20 @@ void AnimationKeyEditor::_track_editor_input_event(const InputEvent& p_input) {
if (mb.button_index==BUTTON_WHEEL_UP && mb.pressed) {
- v_scroll->set_val( v_scroll->get_val() - v_scroll->get_page() / 8 );
+ if (mb.mod.command) {
+ zoom->set_val(zoom->get_val() + zoom->get_step());
+ } else {
+ v_scroll->set_val( v_scroll->get_val() - v_scroll->get_page() / 8 );
+ }
}
if (mb.button_index==BUTTON_WHEEL_DOWN && mb.pressed) {
- v_scroll->set_val( v_scroll->get_val() + v_scroll->get_page() / 8 );
+ if (mb.mod.command) {
+ zoom->set_val(zoom->get_val() - zoom->get_step());
+ } else {
+ v_scroll->set_val( v_scroll->get_val() + v_scroll->get_page() / 8 );
+ }
}
if (mb.button_index==BUTTON_RIGHT && mb.pressed) {