godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42458 from groud/fix_cursor_rotation

Browse Source 
Fix scale cursor rotation and handle diagonal ones
This commit is contained in:
Rémi Verschelde 2020-10-01 12:51:02 +02:00 committed by GitHub
commit 56dee7015f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -2599,12 +2599,28 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) {
} }
void CanvasItemEditor::_update_cursor() { void CanvasItemEditor::_update_cursor() {
CursorShape c = CURSOR_ARROW; // Compute an eventual rotation of the cursor
bool should_switch = false; CursorShape rotation_array[4] = { CURSOR_HSIZE, CURSOR_BDIAGSIZE, CURSOR_VSIZE, CURSOR_FDIAGSIZE };
if (drag_selection.size() != 0) { int rotation_array_index = 0;
float angle = drag_selection[0]->_edit_get_rotation();
should_switch = abs(Math::cos(angle)) < Math_SQRT12; List<CanvasItem *> selection = _get_edited_canvas_items();
if (selection.size() == 1) {
float angle = Math::fposmod((double)selection[0]->get_global_transform_with_canvas().get_rotation(), Math_PI);
if (angle > Math_PI * 7.0 / 8.0) {
rotation_array_index = 0;
} else if (angle > Math_PI * 5.0 / 8.0) {
rotation_array_index = 1;
} else if (angle > Math_PI * 3.0 / 8.0) {
rotation_array_index = 2;
} else if (angle > Math_PI * 1.0 / 8.0) {
rotation_array_index = 3;
} else {
rotation_array_index = 0;
} }
}
// Choose the correct cursor
CursorShape c = CURSOR_ARROW;
switch (drag_type) { switch (drag_type) {
case DRAG_NONE: case DRAG_NONE:
switch (tool) { switch (tool) {
@ -2626,38 +2642,28 @@ void CanvasItemEditor::_update_cursor() {
break; break;
case DRAG_LEFT: case DRAG_LEFT:
case DRAG_RIGHT: case DRAG_RIGHT:
c = rotation_array[rotation_array_index];
break;
case DRAG_V_GUIDE: case DRAG_V_GUIDE:
if (should_switch) {
c = CURSOR_VSIZE;
} else {
c = CURSOR_HSIZE; c = CURSOR_HSIZE;
}
break; break;
case DRAG_TOP: case DRAG_TOP:
case DRAG_BOTTOM: case DRAG_BOTTOM:
c = rotation_array[(rotation_array_index + 2) % 4];
break;
case DRAG_H_GUIDE: case DRAG_H_GUIDE:
if (should_switch) {
c = CURSOR_HSIZE;
} else {
c = CURSOR_VSIZE; c = CURSOR_VSIZE;
}
break; break;
case DRAG_TOP_LEFT: case DRAG_TOP_LEFT:
case DRAG_BOTTOM_RIGHT: case DRAG_BOTTOM_RIGHT:
c = rotation_array[(rotation_array_index + 3) % 4];
break;
case DRAG_DOUBLE_GUIDE: case DRAG_DOUBLE_GUIDE:
if (should_switch) {
c = CURSOR_BDIAGSIZE;
} else {
c = CURSOR_FDIAGSIZE; c = CURSOR_FDIAGSIZE;
}
break; break;
case DRAG_TOP_RIGHT: case DRAG_TOP_RIGHT:
case DRAG_BOTTOM_LEFT: case DRAG_BOTTOM_LEFT:
if (should_switch) { c = rotation_array[(rotation_array_index + 1) % 4];
c = CURSOR_FDIAGSIZE;
} else {
c = CURSOR_BDIAGSIZE;
}
break; break;
case DRAG_MOVE: case DRAG_MOVE:
c = CURSOR_MOVE; c = CURSOR_MOVE;