diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-21 21:08:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-21 21:08:21 +0200 |
| commit | 923ef2662542f8ec882c2f3cc01f773a3e94fdb3 (patch) | |
| tree | 284f689384c8d3e888e0124debf82f5af6e9dae5 /scene | |
| parent | 99980d856bf2581ff7b86e50067a0f8814442834 (diff) | |
| parent | e1b9004b0f1560c4c66e7682334cf870851ebd5c (diff) | |
Merge pull request #31538 from Calinou/filedialog-rename-folder-icon-color
Rename FileDialog's folder icon custom color to `folder_icon_modulate`
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/file_dialog.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/default_theme/default_theme.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 7305d7459c..0c096f0d97 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -400,7 +400,7 @@ void FileDialog::update_file_list() { TreeItem *root = tree->create_item(); Ref<Texture> folder = get_icon("folder"); - const Color folder_color = get_color("folder"); + const Color folder_color = get_color("folder_icon_modulate"); List<String> files; List<String> dirs; 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> &theme, const Ref<Font> &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 |