From 9605fc54c790b1c4364bc0eddfcdd65f979bfc21 Mon Sep 17 00:00:00 2001 From: Daniel Ting Date: Wed, 8 Jul 2020 18:02:38 -0500 Subject: Fix cancel/OK button order on macOS The macOS platform convention regarding button order is cancel on left, OK on right. --- platform/osx/display_server_osx.h | 2 +- platform/osx/display_server_osx.mm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'platform/osx') 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) { -- cgit v1.2.3