mirror of
https://github.com/godotengine/godot
synced 2024-09-04 22:08:29 +00:00
Fix set_default_cursor_shape interaction with Control nodes
Do not call `set_cursor_shape` when the cursor is inside the `Control` node. Make it work for x11 in MOUSE_MODE_CONFINED.
This commit is contained in:
parent
2cf024ed91
commit
64cecf9d61
|
@ -598,7 +598,13 @@ Input::CursorShape InputDefault::get_default_cursor_shape() {
|
|||
|
||||
void InputDefault::set_default_cursor_shape(CursorShape p_shape) {
|
||||
default_shape = p_shape;
|
||||
OS::get_singleton()->set_cursor_shape((OS::CursorShape)p_shape);
|
||||
// The default shape is set in Viewport::_gui_input_event. To instantly
|
||||
// see the shape in the viewport we need to trigger a mouse motion event.
|
||||
Ref<InputEventMouseMotion> mm;
|
||||
mm.instance();
|
||||
mm->set_position(mouse_pos);
|
||||
mm->set_global_position(mouse_pos);
|
||||
parse_input_event(mm);
|
||||
}
|
||||
|
||||
void InputDefault::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
|
||||
|
|
|
@ -2524,13 +2524,16 @@ void OS_X11::set_cursor_shape(CursorShape p_shape) {
|
|||
|
||||
ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
|
||||
|
||||
if (p_shape == current_cursor)
|
||||
if (p_shape == current_cursor) {
|
||||
return;
|
||||
if (mouse_mode == MOUSE_MODE_VISIBLE && mouse_mode != MOUSE_MODE_CONFINED) {
|
||||
if (cursors[p_shape] != None)
|
||||
}
|
||||
|
||||
if (mouse_mode == MOUSE_MODE_VISIBLE || mouse_mode == MOUSE_MODE_CONFINED) {
|
||||
if (cursors[p_shape] != None) {
|
||||
XDefineCursor(x11_display, x11_window, cursors[p_shape]);
|
||||
else if (cursors[CURSOR_ARROW] != None)
|
||||
} else if (cursors[CURSOR_ARROW] != None) {
|
||||
XDefineCursor(x11_display, x11_window, cursors[CURSOR_ARROW]);
|
||||
}
|
||||
}
|
||||
|
||||
current_cursor = p_shape;
|
||||
|
|
Loading…
Reference in a new issue