浏览代码

AnimationEditor: zoom using ctrl+wheel

closes #6585

(cherry picked from commit 3cce39c2d37d73124038def2f002cc372ddceb8c)
Andreas Haas 9 年之前
父节点
当前提交
02487a4be1
共有 1 个文件被更改,包括 10 次插入2 次删除
  1. 10 2
      tools/editor/animation_editor.cpp

+ 10 - 2
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) {