summaryrefslogtreecommitdiff
path: root/platform/osx/display_server_osx.mm
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-07-15 09:21:04 +0200
committerGitHub <noreply@github.com>2020-07-15 09:21:04 +0200
commitc8523038ccdf3f28640427380ddc4cd0b06bcb57 (patch)
treec6dd064ad3fe81e44ed8073417bad22ae3656f95 /platform/osx/display_server_osx.mm
parentb79aa897963b2686b1472dcf336bbd0c3f956db7 (diff)
parent9605fc54c790b1c4364bc0eddfcdd65f979bfc21 (diff)
Merge pull request #40268 from DanielZTing/master
Fix cancel/OK button order on macOS
Diffstat (limited to 'platform/osx/display_server_osx.mm')
-rw-r--r--platform/osx/display_server_osx.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm
index d7562a8860..5cc2b25910 100644
--- a/platform/osx/display_server_osx.mm
+++ b/platform/osx/display_server_osx.mm
@@ -2915,8 +2915,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) {