From e1b9004b0f1560c4c66e7682334cf870851ebd5c Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 21 Aug 2019 18:43:01 +0200 Subject: Rename FileDialog's folder icon custom color to `folder_icon_modulate` The custom color introduced in be8d569744e4eed9acb313d355d96e6989e92087 had the same name as the "folder" icon, which could cause conflicts in the generated documentation. The new name is also more self-explanatory. --- scene/resources/default_theme/default_theme.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scene/resources/default_theme') diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 90787780d3..2664abdd2a 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -760,7 +760,7 @@ void fill_default_theme(Ref &theme, const Ref &default_font, const // FileDialog theme->set_icon("folder", "FileDialog", make_icon(icon_folder_png)); - theme->set_color("folder", "FileDialog", Color(1, 1, 1)); + theme->set_color("folder_icon_modulate", "FileDialog", Color(1, 1, 1)); theme->set_color("files_disabled", "FileDialog", Color(0, 0, 0, 0.7)); // colorPicker -- cgit v1.2.3