diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-15 09:21:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 09:21:04 +0200 |
| commit | c8523038ccdf3f28640427380ddc4cd0b06bcb57 (patch) | |
| tree | c6dd064ad3fe81e44ed8073417bad22ae3656f95 /doc | |
| parent | b79aa897963b2686b1472dcf336bbd0c3f956db7 (diff) | |
| parent | 9605fc54c790b1c4364bc0eddfcdd65f979bfc21 (diff) | |
Merge pull request #40268 from DanielZTing/master
Fix cancel/OK button order on macOS
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/classes/DisplayServer.xml | 2 | ||||
| -rw-r--r-- | doc/classes/ProjectSettings.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/classes/DisplayServer.xml b/doc/classes/DisplayServer.xml index d118cf8205..49af8d7de2 100644 --- a/doc/classes/DisplayServer.xml +++ b/doc/classes/DisplayServer.xml @@ -139,7 +139,7 @@ <description> </description> </method> - <method name="get_swap_ok_cancel"> + <method name="get_swap_cancel_ok"> <return type="bool"> </return> <description> diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index c8427ac61f..e255ce2e1a 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -472,8 +472,8 @@ <member name="gui/common/default_scroll_deadzone" type="int" setter="" getter="" default="0"> Default value for [member ScrollContainer.scroll_deadzone], which will be used for all [ScrollContainer]s unless overridden. </member> - <member name="gui/common/swap_ok_cancel" type="bool" setter="" getter="" default="false"> - If [code]true[/code], swaps OK and Cancel buttons in dialogs on Windows and UWP to follow interface conventions. + <member name="gui/common/swap_cancel_ok" type="bool" setter="" getter="" default="false"> + If [code]true[/code], swaps Cancel and OK buttons in dialogs on Windows and UWP to follow interface conventions. </member> <member name="gui/common/text_edit_undo_stack_max_size" type="int" setter="" getter="" default="1024"> </member> |