diff options
Diffstat (limited to 'editor/gui/editor_file_dialog.cpp')
| -rw-r--r-- | editor/gui/editor_file_dialog.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/editor/gui/editor_file_dialog.cpp b/editor/gui/editor_file_dialog.cpp index cf701f1e63..6e1a12073b 100644 --- a/editor/gui/editor_file_dialog.cpp +++ b/editor/gui/editor_file_dialog.cpp @@ -75,37 +75,37 @@ VBoxContainer *EditorFileDialog::get_vbox() { void EditorFileDialog::_update_theme_item_cache() { ConfirmationDialog::_update_theme_item_cache(); - theme_cache.parent_folder = get_theme_icon(SNAME("ArrowUp"), SNAME("EditorIcons")); - theme_cache.forward_folder = get_theme_icon(SNAME("Forward"), SNAME("EditorIcons")); - theme_cache.back_folder = get_theme_icon(SNAME("Back"), SNAME("EditorIcons")); - theme_cache.reload = get_theme_icon(SNAME("Reload"), SNAME("EditorIcons")); - theme_cache.toggle_hidden = get_theme_icon(SNAME("GuiVisibilityVisible"), SNAME("EditorIcons")); - theme_cache.favorite = get_theme_icon(SNAME("Favorites"), SNAME("EditorIcons")); - theme_cache.mode_thumbnails = get_theme_icon(SNAME("FileThumbnail"), SNAME("EditorIcons")); - theme_cache.mode_list = get_theme_icon(SNAME("FileList"), SNAME("EditorIcons")); - theme_cache.favorites_up = get_theme_icon(SNAME("MoveUp"), SNAME("EditorIcons")); - theme_cache.favorites_down = get_theme_icon(SNAME("MoveDown"), SNAME("EditorIcons")); - - theme_cache.folder = get_theme_icon(SNAME("Folder"), SNAME("EditorIcons")); + theme_cache.parent_folder = get_editor_theme_icon(SNAME("ArrowUp")); + theme_cache.forward_folder = get_editor_theme_icon(SNAME("Forward")); + theme_cache.back_folder = get_editor_theme_icon(SNAME("Back")); + theme_cache.reload = get_editor_theme_icon(SNAME("Reload")); + theme_cache.toggle_hidden = get_editor_theme_icon(SNAME("GuiVisibilityVisible")); + theme_cache.favorite = get_editor_theme_icon(SNAME("Favorites")); + theme_cache.mode_thumbnails = get_editor_theme_icon(SNAME("FileThumbnail")); + theme_cache.mode_list = get_editor_theme_icon(SNAME("FileList")); + theme_cache.favorites_up = get_editor_theme_icon(SNAME("MoveUp")); + theme_cache.favorites_down = get_editor_theme_icon(SNAME("MoveDown")); + + theme_cache.folder = get_editor_theme_icon(SNAME("Folder")); theme_cache.folder_icon_color = get_theme_color(SNAME("folder_icon_color"), SNAME("FileDialog")); - theme_cache.action_copy = get_theme_icon(SNAME("ActionCopy"), SNAME("EditorIcons")); - theme_cache.action_delete = get_theme_icon(SNAME("Remove"), SNAME("EditorIcons")); - theme_cache.filesystem = get_theme_icon(SNAME("Filesystem"), SNAME("EditorIcons")); + theme_cache.action_copy = get_editor_theme_icon(SNAME("ActionCopy")); + theme_cache.action_delete = get_editor_theme_icon(SNAME("Remove")); + theme_cache.filesystem = get_editor_theme_icon(SNAME("Filesystem")); - theme_cache.folder_medium_thumbnail = get_theme_icon(SNAME("FolderMediumThumb"), SNAME("EditorIcons")); - theme_cache.file_medium_thumbnail = get_theme_icon(SNAME("FileMediumThumb"), SNAME("EditorIcons")); - theme_cache.folder_big_thumbnail = get_theme_icon(SNAME("FolderBigThumb"), SNAME("EditorIcons")); - theme_cache.file_big_thumbnail = get_theme_icon(SNAME("FileBigThumb"), SNAME("EditorIcons")); + theme_cache.folder_medium_thumbnail = get_editor_theme_icon(SNAME("FolderMediumThumb")); + theme_cache.file_medium_thumbnail = get_editor_theme_icon(SNAME("FileMediumThumb")); + theme_cache.folder_big_thumbnail = get_editor_theme_icon(SNAME("FolderBigThumb")); + theme_cache.file_big_thumbnail = get_editor_theme_icon(SNAME("FileBigThumb")); - theme_cache.progress[0] = get_theme_icon("Progress1", SNAME("EditorIcons")); - theme_cache.progress[1] = get_theme_icon("Progress2", SNAME("EditorIcons")); - theme_cache.progress[2] = get_theme_icon("Progress3", SNAME("EditorIcons")); - theme_cache.progress[3] = get_theme_icon("Progress4", SNAME("EditorIcons")); - theme_cache.progress[4] = get_theme_icon("Progress5", SNAME("EditorIcons")); - theme_cache.progress[5] = get_theme_icon("Progress6", SNAME("EditorIcons")); - theme_cache.progress[6] = get_theme_icon("Progress7", SNAME("EditorIcons")); - theme_cache.progress[7] = get_theme_icon("Progress8", SNAME("EditorIcons")); + theme_cache.progress[0] = get_editor_theme_icon("Progress1"); + theme_cache.progress[1] = get_editor_theme_icon("Progress2"); + theme_cache.progress[2] = get_editor_theme_icon("Progress3"); + theme_cache.progress[3] = get_editor_theme_icon("Progress4"); + theme_cache.progress[4] = get_editor_theme_icon("Progress5"); + theme_cache.progress[5] = get_editor_theme_icon("Progress6"); + theme_cache.progress[6] = get_editor_theme_icon("Progress7"); + theme_cache.progress[7] = get_editor_theme_icon("Progress8"); } void EditorFileDialog::_notification(int p_what) { @@ -1535,7 +1535,7 @@ void EditorFileDialog::_recent_selected(int p_idx) { } void EditorFileDialog::_go_up() { - dir_access->change_dir(get_current_dir().get_base_dir()); + dir_access->change_dir(get_current_dir().trim_suffix("/").get_base_dir()); update_file_list(); update_dir(); _push_history(); |