From ffd536218700dac5c1e03dbbda24b46dcb27df17 Mon Sep 17 00:00:00 2001 From: Haoyu Qiu Date: Sat, 14 May 2022 09:48:46 +0800 Subject: Swap the meaning of CURSOR_WAIT and CURSOR_BUSY --- doc/classes/Control.xml | 4 ++-- doc/classes/Input.xml | 4 ++-- platform/javascript/display_server_javascript.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml index d084bd4db9..17510cc9b0 100644 --- a/doc/classes/Control.xml +++ b/doc/classes/Control.xml @@ -1194,10 +1194,10 @@ Show the system's cross mouse cursor when the user hovers the node. - Show the system's wait mouse cursor, often an hourglass, when the user hovers the node. + Show the system's wait mouse cursor when the user hovers the node. Often an hourglass. - Show the system's busy mouse cursor when the user hovers the node. Often an hourglass. + Show the system's busy mouse cursor when the user hovers the node. Often an arrow with a small hourglass. Show the system's drag mouse cursor, often a closed fist or a cross symbol, when the user hovers the node. It tells the user they're currently dragging an item, like a node in the Scene dock. diff --git a/doc/classes/Input.xml b/doc/classes/Input.xml index 948c4b253f..2a4381b41b 100644 --- a/doc/classes/Input.xml +++ b/doc/classes/Input.xml @@ -428,10 +428,10 @@ Cross cursor. Typically appears over regions in which a drawing operation can be performed or for selections. - Wait cursor. Indicates that the application is busy performing an operation. This cursor shape denotes that the application is still usable during the operation. + Wait cursor. Indicates that the application is busy performing an operation. This cursor shape denotes that the application isn't usable during the operation (e.g. something is blocking its main thread). - Busy cursor. Indicates that the application is busy performing an operation. This cursor shape denotes that the application isn't usable during the operation (e.g. something is blocking its main thread). + Busy cursor. Indicates that the application is busy performing an operation. This cursor shape denotes that the application is still usable during the operation. Drag cursor. Usually displayed when dragging something. diff --git a/platform/javascript/display_server_javascript.cpp b/platform/javascript/display_server_javascript.cpp index 312707c3b5..d60ad4f1e8 100644 --- a/platform/javascript/display_server_javascript.cpp +++ b/platform/javascript/display_server_javascript.cpp @@ -244,9 +244,9 @@ const char *DisplayServerJavaScript::godot2dom_cursor(DisplayServer::CursorShape case DisplayServer::CURSOR_CROSS: return "crosshair"; case DisplayServer::CURSOR_WAIT: - return "progress"; - case DisplayServer::CURSOR_BUSY: return "wait"; + case DisplayServer::CURSOR_BUSY: + return "progress"; case DisplayServer::CURSOR_DRAG: return "grab"; case DisplayServer::CURSOR_CAN_DROP: -- cgit v1.2.3