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 /scene/gui/dialogs.cpp | |
| parent | b79aa897963b2686b1472dcf336bbd0c3f956db7 (diff) | |
| parent | 9605fc54c790b1c4364bc0eddfcdd65f979bfc21 (diff) | |
| download | redot-engine-c8523038ccdf3f28640427380ddc4cd0b06bcb57.tar.gz | |
Merge pull request #40268 from DanielZTing/master
Fix cancel/OK button order on macOS
Diffstat (limited to 'scene/gui/dialogs.cpp')
| -rw-r--r-- | scene/gui/dialogs.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index faef979090..9077bfa4ba 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -258,7 +258,7 @@ Button *AcceptDialog::add_cancel(const String &p_cancel) { if (p_cancel == "") { c = RTR("Cancel"); } - Button *b = swap_ok_cancel ? add_button(c, true) : add_button(c); + Button *b = swap_cancel_ok ? add_button(c, true) : add_button(c); b->connect("pressed", callable_mp(this, &AcceptDialog::_cancel_pressed)); return b; } @@ -286,9 +286,9 @@ void AcceptDialog::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL, "dialog_autowrap"), "set_autowrap", "has_autowrap"); } -bool AcceptDialog::swap_ok_cancel = false; -void AcceptDialog::set_swap_ok_cancel(bool p_swap) { - swap_ok_cancel = p_swap; +bool AcceptDialog::swap_cancel_ok = false; +void AcceptDialog::set_swap_cancel_ok(bool p_swap) { + swap_cancel_ok = p_swap; } AcceptDialog::AcceptDialog() { |