diff options
| author | Daniel Ting <danielzting@gmail.com> | 2020-07-08 18:02:38 -0500 |
|---|---|---|
| committer | Daniel Ting <danielzting@gmail.com> | 2020-07-10 15:10:11 -0500 |
| commit | 9605fc54c790b1c4364bc0eddfcdd65f979bfc21 (patch) | |
| tree | 114b5d6f9f3172275b9ce2e513b0b5c29a182271 /servers | |
| parent | dcd11faad3802679a43b27155f1b6bc59aa39b60 (diff) | |
Fix cancel/OK button order on macOS
The macOS platform convention regarding button order is cancel on left,
OK on right.
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/display_server.cpp | 4 | ||||
| -rw-r--r-- | servers/display_server.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/servers/display_server.cpp b/servers/display_server.cpp index 72cfd87880..65db0de001 100644 --- a/servers/display_server.cpp +++ b/servers/display_server.cpp @@ -238,7 +238,7 @@ void DisplayServer::cursor_set_custom_image(const RES &p_cursor, CursorShape p_s WARN_PRINT("Custom cursor shape not supported by this display server."); } -bool DisplayServer::get_swap_ok_cancel() { +bool DisplayServer::get_swap_cancel_ok() { return false; } @@ -464,7 +464,7 @@ void DisplayServer::_bind_methods() { ClassDB::bind_method(D_METHOD("cursor_get_shape"), &DisplayServer::cursor_get_shape); ClassDB::bind_method(D_METHOD("cursor_set_custom_image", "cursor", "shape", "hotspot"), &DisplayServer::cursor_set_custom_image, DEFVAL(CURSOR_ARROW), DEFVAL(Vector2())); - ClassDB::bind_method(D_METHOD("get_swap_ok_cancel"), &DisplayServer::get_swap_ok_cancel); + ClassDB::bind_method(D_METHOD("get_swap_cancel_ok"), &DisplayServer::get_swap_cancel_ok); ClassDB::bind_method(D_METHOD("enable_for_stealing_focus", "process_id"), &DisplayServer::enable_for_stealing_focus); diff --git a/servers/display_server.h b/servers/display_server.h index 79f6f5d0fc..2cf0a83dbd 100644 --- a/servers/display_server.h +++ b/servers/display_server.h @@ -318,7 +318,7 @@ public: virtual CursorShape cursor_get_shape() const; virtual void cursor_set_custom_image(const RES &p_cursor, CursorShape p_shape = CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()); - virtual bool get_swap_ok_cancel(); + virtual bool get_swap_cancel_ok(); virtual void enable_for_stealing_focus(OS::ProcessID pid); |