godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Request immediate refresh of cursor in 2D editor while using shortcuts

Browse Source 
Fixes: #37333
This commit is contained in:
Dominik 'dreamsComeTrue' Jasiński
2020-03-26 21:35:12 +01:00
parent 5f1107aa30
commit 55e5fa427a
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -2528,6 +2528,15 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) {
_gui_input_hover(p_event); _gui_input_hover(p_event);
// Change the cursor // Change the cursor
_update_cursor();
// Grab focus
if (!viewport->has_focus() && (!get_focus_owner() || !get_focus_owner()->is_text_field())) {
viewport->call_deferred("grab_focus");
}
}
void CanvasItemEditor::_update_cursor() {
CursorShape c = CURSOR_ARROW; CursorShape c = CURSOR_ARROW;
switch (drag_type) { switch (drag_type) {
case DRAG_NONE: case DRAG_NONE:
@@ -2580,11 +2589,6 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) {
c = CURSOR_HSIZE; c = CURSOR_HSIZE;
viewport->set_default_cursor_shape(c); viewport->set_default_cursor_shape(c);
// Grab focus
if (!viewport->has_focus() && (!get_focus_owner() || !get_focus_owner()->is_text_field())) {
viewport->call_deferred("grab_focus");
}
} }
void CanvasItemEditor::_draw_text_at_position(Point2 p_position, String p_string, Margin p_side) { void CanvasItemEditor::_draw_text_at_position(Point2 p_position, String p_string, Margin p_side) {
@@ -4380,7 +4384,13 @@ void CanvasItemEditor::_button_tool_select(int p_index) {
} }
tool = (Tool)p_index; tool = (Tool)p_index;
viewport->update(); viewport->update();
_update_cursor();
// Request immediate refresh of cursor when using hot-keys to switch between tools
DisplayServer::CursorShape ds_cursor_shape = (DisplayServer::CursorShape)viewport->get_default_cursor_shape();
DisplayServer::get_singleton()->cursor_set_shape(ds_cursor_shape);
} }
void CanvasItemEditor::_insert_animation_keys(bool p_location, bool p_rotation, bool p_scale, bool p_on_existing) { void CanvasItemEditor::_insert_animation_keys(bool p_location, bool p_rotation, bool p_scale, bool p_on_existing) {

1
editor/plugins/canvas_item_editor_plugin.h
View File

@@ -501,6 +501,7 @@ private:
bool _gui_input_hover(const Ref<InputEvent> &p_event); bool _gui_input_hover(const Ref<InputEvent> &p_event);
void _gui_input_viewport(const Ref<InputEvent> &p_event); void _gui_input_viewport(const Ref<InputEvent> &p_event);
void _update_cursor();
void _selection_changed(); void _selection_changed();