seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #102846 from jaydensipe/fix-empty-theme-override-delete-all

Browse Source 
Fix empty type removal in theme editor causing all empty types to be deleted
This commit is contained in:
Thaddeus Crews
2025-03-19 17:46:04 -05:00
parent 1fbcefeb63 6b257364bd
commit 60c706e2d5
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editor/plugins/theme_editor_plugin.cpp
View File

@ -1588,15 +1588,11 @@ void ThemeItemEditorDialog::_add_theme_item(Theme::DataType p_data_type, String
void ThemeItemEditorDialog::_remove_theme_type(const String &p_theme_type) { void ThemeItemEditorDialog::_remove_theme_type(const String &p_theme_type) {
Ref<Theme> old_snapshot = edited_theme->duplicate(); Ref<Theme> old_snapshot = edited_theme->duplicate();
Ref<Theme> new_snapshot = edited_theme->duplicate();
EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton(); EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
ur->create_action(TTR("Remove Theme Type")); ur->create_action(TTR("Remove Theme Type"));
new_snapshot->remove_type(p_theme_type); ur->add_do_method(*edited_theme, "remove_type", p_theme_type);
ur->add_do_method(*edited_theme, "clear");
ur->add_do_method(*edited_theme, "merge_with", new_snapshot);
// If the type was empty, it cannot be restored with merge, but thankfully we can fake it. // If the type was empty, it cannot be restored with merge, but thankfully we can fake it.
ur->add_undo_method(*edited_theme, "add_type", p_theme_type); ur->add_undo_method(*edited_theme, "add_type", p_theme_type);
ur->add_undo_method(*edited_theme, "merge_with", old_snapshot); ur->add_undo_method(*edited_theme, "merge_with", old_snapshot);