asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #27770 from KoBeWi/moving_pan_v2

Browse source 
Allow panning while moving a node
This commit is contained in:
Rémi Verschelde 2019-04-08 10:07:24 +02:00 committed by GitHub
commit 853af06f5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -1072,36 +1072,36 @@ bool CanvasItemEditor::_gui_input_zoom_or_pan(const Ref<InputEvent> &p_event) {
} }
} }
if (drag_type == DRAG_NONE) { if (!panning) {
if (b->is_pressed() && if (b->is_pressed() &&
(b->get_button_index() == BUTTON_MIDDLE || (b->get_button_index() == BUTTON_MIDDLE ||
(b->get_button_index() == BUTTON_LEFT && tool == TOOL_PAN) || (b->get_button_index() == BUTTON_LEFT && tool == TOOL_PAN) ||
(b->get_button_index() == BUTTON_LEFT && !EditorSettings::get_singleton()->get("editors/2d/simple_spacebar_panning") && Input::get_singleton()->is_key_pressed(KEY_SPACE)))) { (b->get_button_index() == BUTTON_LEFT && !EditorSettings::get_singleton()->get("editors/2d/simple_spacebar_panning") && Input::get_singleton()->is_key_pressed(KEY_SPACE)))) {
// Pan the viewport // Pan the viewport
drag_type = DRAG_PAN; panning = true;
} }
} }
if (drag_type == DRAG_PAN) { if (panning) {
if (!b->is_pressed()) { if (!b->is_pressed()) {
// Stop panning the viewport (for any mouse button press) // Stop panning the viewport (for any mouse button press)
drag_type = DRAG_NONE; panning = false;
} }
} }
} }
Ref<InputEventKey> k = p_event; Ref<InputEventKey> k = p_event;
if (k.is_valid()) { if (k.is_valid()) {
if (k->get_scancode() == KEY_SPACE && EditorSettings::get_singleton()->get("editors/2d/simple_spacebar_panning")) { if (k->get_scancode() == KEY_SPACE && (EditorSettings::get_singleton()->get("editors/2d/simple_spacebar_panning") || drag_type != DRAG_NONE)) {
if (drag_type == DRAG_NONE) { if (!panning) {
if (k->is_pressed() && !k->is_echo()) { if (k->is_pressed() && !k->is_echo()) {
//Pan the viewport //Pan the viewport
drag_type = DRAG_PAN; panning = true;
} }
} else if (drag_type == DRAG_PAN) { } else if (panning) {
if (!k->is_pressed()) { if (!k->is_pressed()) {
// Stop panning the viewport (for any mouse button press) // Stop panning the viewport (for any mouse button press)
drag_type = DRAG_NONE; panning = false;
} }
} }
} }
@ -1109,7 +1109,7 @@ bool CanvasItemEditor::_gui_input_zoom_or_pan(const Ref<InputEvent> &p_event) {
Ref<InputEventMouseMotion> m = p_event; Ref<InputEventMouseMotion> m = p_event;
if (m.is_valid()) { if (m.is_valid()) {
if (drag_type == DRAG_PAN) { if (panning) {
// Pan the viewport // Pan the viewport
Point2i relative; Point2i relative;
if (bool(EditorSettings::get_singleton()->get("editors/2d/warped_mouse_panning"))) { if (bool(EditorSettings::get_singleton()->get("editors/2d/warped_mouse_panning"))) {
@ -2190,32 +2190,34 @@ bool CanvasItemEditor::_gui_input_hover(const Ref<InputEvent> &p_event) {
void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) {
bool accepted = false; bool accepted = false;
if ((accepted = _gui_input_rulers_and_guides(p_event))) { if (EditorSettings::get_singleton()->get("editors/2d/simple_spacebar_panning") || !Input::get_singleton()->is_key_pressed(KEY_SPACE)) {
//printf("Rulers and guides\n"); if ((accepted = _gui_input_rulers_and_guides(p_event))) {
} else if ((accepted = editor->get_editor_plugins_over()->forward_gui_input(p_event))) { //printf("Rulers and guides\n");
//printf("Plugin\n"); } else if ((accepted = editor->get_editor_plugins_over()->forward_gui_input(p_event))) {
} else if ((accepted = _gui_input_open_scene_on_double_click(p_event))) { //printf("Plugin\n");
//printf("Open scene on double click\n"); } else if ((accepted = _gui_input_open_scene_on_double_click(p_event))) {
} else if ((accepted = _gui_input_anchors(p_event))) { //printf("Open scene on double click\n");
//printf("Anchors\n"); } else if ((accepted = _gui_input_anchors(p_event))) {
} else if ((accepted = _gui_input_scale(p_event))) { //printf("Anchors\n");
//printf("Set scale\n"); } else if ((accepted = _gui_input_scale(p_event))) {
} else if ((accepted = _gui_input_pivot(p_event))) { //printf("Set scale\n");
//printf("Set pivot\n"); } else if ((accepted = _gui_input_pivot(p_event))) {
} else if ((accepted = _gui_input_resize(p_event))) { //printf("Set pivot\n");
//printf("Resize\n"); } else if ((accepted = _gui_input_resize(p_event))) {
} else if ((accepted = _gui_input_rotate(p_event))) { //printf("Resize\n");
//printf("Rotate\n"); } else if ((accepted = _gui_input_rotate(p_event))) {
} else if ((accepted = _gui_input_move(p_event))) { //printf("Rotate\n");
//printf("Move\n"); } else if ((accepted = _gui_input_move(p_event))) {
} else if ((accepted = _gui_input_zoom_or_pan(p_event))) { //printf("Move\n");
//printf("Zoom or pan\n"); } else if ((accepted = _gui_input_select(p_event))) {
} else if ((accepted = _gui_input_select(p_event))) { //printf("Selection\n");
//printf("Selection\n"); } else {
} else { //printf("Not accepted\n");
//printf("Not accepted\n"); }
} }
accepted = (_gui_input_zoom_or_pan(p_event) || accepted);
if (accepted) if (accepted)
accept_event(); accept_event();
@ -2259,9 +2261,6 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) {
case DRAG_MOVE: case DRAG_MOVE:
c = CURSOR_MOVE; c = CURSOR_MOVE;
break; break;
case DRAG_PAN:
c = CURSOR_DRAG;
break;
default: default:
break; break;
} }
@ -4591,6 +4590,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
drag_to = Vector2(); drag_to = Vector2();
dragged_guide_pos = Point2(); dragged_guide_pos = Point2();
dragged_guide_index = -1; dragged_guide_index = -1;
panning = false;
bone_last_frame = 0; bone_last_frame = 0;

4
editor/plugins/canvas_item_editor_plugin.h
View file

@ -205,8 +205,7 @@ private:
DRAG_V_GUIDE, DRAG_V_GUIDE,
DRAG_H_GUIDE, DRAG_H_GUIDE,
DRAG_DOUBLE_GUIDE, DRAG_DOUBLE_GUIDE,
DRAG_KEY_MOVE, DRAG_KEY_MOVE
DRAG_PAN
}; };
EditorSelection *editor_selection; EditorSelection *editor_selection;
@ -262,6 +261,7 @@ private:
bool key_pos; bool key_pos;
bool key_rot; bool key_rot;
bool key_scale; bool key_scale;
bool panning;
MenuOption last_option; MenuOption last_option;