diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-23 18:16:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-23 18:16:43 +0200 |
| commit | 1d30c47f4993d462eedfb41466cd030713476e8a (patch) | |
| tree | 29a701e44827bfd3311e02ab669ac5ab4f3a3909 /scene/main | |
| parent | 1190fbdf2b7c516eb36d0ed2b8da0609d20f1980 (diff) | |
| parent | 910efbff03b588d2aba7ca99c1cc018669a5d492 (diff) | |
Merge pull request #64774 from RandomShaper/check_cursor_shape_avail
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/viewport.cpp | 8 | ||||
| -rw-r--r-- | scene/main/window.cpp | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index cc356e513c..764fc60bc1 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1875,7 +1875,9 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) { } } - DisplayServer::get_singleton()->cursor_set_shape(ds_cursor_shape); + if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CURSOR_SHAPE)) { + DisplayServer::get_singleton()->cursor_set_shape(ds_cursor_shape); + } } Ref<InputEventScreenTouch> touch_event = p_event; @@ -2684,7 +2686,9 @@ bool Viewport::_sub_windows_forward_input(const Ref<InputEvent> &p_event) { DisplayServer::CURSOR_FDIAGSIZE }; - DisplayServer::get_singleton()->cursor_set_shape(shapes[resize]); + if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CURSOR_SHAPE)) { + DisplayServer::get_singleton()->cursor_set_shape(shapes[resize]); + } return true; // Reserved for showing the resize cursor. } diff --git a/scene/main/window.cpp b/scene/main/window.cpp index 63cc535e26..bf50ca0956 100644 --- a/scene/main/window.cpp +++ b/scene/main/window.cpp @@ -349,7 +349,9 @@ void Window::_event_callback(DisplayServer::WindowEvent p_event) { _propagate_window_notification(this, NOTIFICATION_WM_MOUSE_ENTER); emit_signal(SNAME("mouse_entered")); notification(NOTIFICATION_VP_MOUSE_ENTER); - DisplayServer::get_singleton()->cursor_set_shape(DisplayServer::CURSOR_ARROW); //restore cursor shape + if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CURSOR_SHAPE)) { + DisplayServer::get_singleton()->cursor_set_shape(DisplayServer::CURSOR_ARROW); //restore cursor shape + } } break; case DisplayServer::WINDOW_EVENT_MOUSE_EXIT: { notification(NOTIFICATION_VP_MOUSE_EXIT); |