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 /platform/osx | |
| 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 'platform/osx')
| -rw-r--r-- | platform/osx/display_server_osx.h | 2 | ||||
| -rw-r--r-- | platform/osx/display_server_osx.mm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/osx/display_server_osx.h b/platform/osx/display_server_osx.h index c636463e68..68e8454fd0 100644 --- a/platform/osx/display_server_osx.h +++ b/platform/osx/display_server_osx.h @@ -288,7 +288,7 @@ public: virtual CursorShape cursor_get_shape() const override; virtual void cursor_set_custom_image(const RES &p_cursor, CursorShape p_shape = CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override; - virtual bool get_swap_ok_cancel() override; + virtual bool get_swap_cancel_ok() override; virtual int keyboard_get_layout_count() const override; virtual int keyboard_get_current_layout() const override; diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm index 07ecd5d2c6..19d7540c93 100644 --- a/platform/osx/display_server_osx.mm +++ b/platform/osx/display_server_osx.mm @@ -2913,8 +2913,8 @@ void DisplayServerOSX::window_set_ime_position(const Point2i &p_pos, WindowID p_ wd.im_position = p_pos; } -bool DisplayServerOSX::get_swap_ok_cancel() { - return true; +bool DisplayServerOSX::get_swap_cancel_ok() { + return false; } void DisplayServerOSX::cursor_set_shape(CursorShape p_shape) { |