godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code 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

2
editor/plugins/shader_editor_plugin.cpp
View File

@@ -667,7 +667,7 @@ ShaderEditor::ShaderEditor(EditorNode *p_node) {
disk_changed->connect("confirmed", callable_mp(this, &ShaderEditor::_reload_shader_from_disk));
disk_changed->get_ok()->set_text(TTR("Reload"));
disk_changed->add_button(TTR("Resave"), !DisplayServer::get_singleton()->get_swap_ok_cancel(), "resave");
disk_changed->add_button(TTR("Resave"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave");
disk_changed->connect("custom_action", callable_mp(this, &ShaderEditor::save_external_data));
add_child(disk_changed);