nick/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-02-16 07:41:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40268 from DanielZTing/master

Browse Source 
Fix cancel/OK button order on macOS
This commit is contained in:
Rémi Verschelde
2020-07-15 09:21:04 +02:00
committed by GitHub
parent b79aa89796 9605fc54c7
commit c8523038cc
17 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_node.cpp
View File

@@ -6482,7 +6482,7 @@ EditorNode::EditorNode() {
confirmation->connect("confirmed", callable_mp(this, &EditorNode::_menu_confirm_current));
save_confirmation = memnew(ConfirmationDialog);
save_confirmation->add_button(TTR("Don't Save"), DisplayServer::get_singleton()->get_swap_ok_cancel(), "discard");
save_confirmation->add_button(TTR("Don't Save"), DisplayServer::get_singleton()->get_swap_cancel_ok(), "discard");
gui_base->add_child(save_confirmation);
save_confirmation->connect("confirmed", callable_mp(this, &EditorNode::_menu_confirm_current));
save_confirmation->connect("custom_action", callable_mp(this, &EditorNode::_discard_changes));
@@ -6701,7 +6701,7 @@ EditorNode::EditorNode() {
open_imported = memnew(ConfirmationDialog);
open_imported->get_ok()->set_text(TTR("Open Anyway"));
new_inherited_button = open_imported->add_button(TTR("New Inherited"), !DisplayServer::get_singleton()->get_swap_ok_cancel(), "inherit");
new_inherited_button = open_imported->add_button(TTR("New Inherited"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "inherit");
open_imported->connect("confirmed", callable_mp(this, &EditorNode::_open_imported));
open_imported->connect("custom_action", callable_mp(this, &EditorNode::_inherit_imported));
gui_base->add_child(open_imported);