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

Remove redundant vbx variable in FileDialog

Browse Source
This commit is contained in:
unknown 2020-04-04 14:58:57 +05:30
parent 9abb415d92
commit 7e4db6174d
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scene/gui/file_dialog.cpp
View File

@ -46,9 +46,9 @@ VBoxContainer *FileDialog::get_vbox() {
void FileDialog::_theme_changed() { void FileDialog::_theme_changed() {
Color font_color = vbc->get_theme_color("font_color", "ToolButton"); Color font_color = vbox->get_theme_color("font_color", "ToolButton");
Color font_color_hover = vbc->get_theme_color("font_color_hover", "ToolButton"); Color font_color_hover = vbox->get_theme_color("font_color_hover", "ToolButton");
Color font_color_pressed = vbc->get_theme_color("font_color_pressed", "ToolButton"); Color font_color_pressed = vbox->get_theme_color("font_color_pressed", "ToolButton");
dir_up->add_theme_color_override("icon_color_normal", font_color); dir_up->add_theme_color_override("icon_color_normal", font_color);
dir_up->add_theme_color_override("icon_color_hover", font_color_hover); dir_up->add_theme_color_override("icon_color_hover", font_color_hover);
@ -73,9 +73,9 @@ void FileDialog::_notification(int p_what) {
} }
if (p_what == NOTIFICATION_ENTER_TREE) { if (p_what == NOTIFICATION_ENTER_TREE) {
dir_up->set_icon(vbc->get_theme_icon("parent_folder")); dir_up->set_icon(vbox->get_theme_icon("parent_folder"));
refresh->set_icon(vbc->get_theme_icon("reload")); refresh->set_icon(vbox->get_theme_icon("reload"));
show_hidden->set_icon(vbc->get_theme_icon("toggle_hidden")); show_hidden->set_icon(vbox->get_theme_icon("toggle_hidden"));
_theme_changed(); _theme_changed();
} }
} }
@ -429,8 +429,8 @@ void FileDialog::update_file_list() {
dir_access->list_dir_begin(); dir_access->list_dir_begin();
TreeItem *root = tree->create_item(); TreeItem *root = tree->create_item();
Ref<Texture2D> folder = vbc->get_theme_icon("folder"); Ref<Texture2D> folder = vbox->get_theme_icon("folder");
const Color folder_color = vbc->get_theme_color("folder_icon_modulate"); const Color folder_color = vbox->get_theme_color("folder_icon_modulate");
List<String> files; List<String> files;
List<String> dirs; List<String> dirs;
@ -528,7 +528,7 @@ void FileDialog::update_file_list() {
} }
if (mode == FILE_MODE_OPEN_DIR) { if (mode == FILE_MODE_OPEN_DIR) {
ti->set_custom_color(0, vbc->get_theme_color("files_disabled")); ti->set_custom_color(0, vbox->get_theme_color("files_disabled"));
ti->set_selectable(0, false); ti->set_selectable(0, false);
} }
Dictionary d; Dictionary d;
@ -888,9 +888,9 @@ FileDialog::FileDialog() {
mode_overrides_title = true; mode_overrides_title = true;
vbc = memnew(VBoxContainer); vbox = memnew(VBoxContainer);
add_child(vbc); add_child(vbox);
vbc->connect("theme_changed", callable_mp(this, &FileDialog::_theme_changed)); vbox->connect("theme_changed", callable_mp(this, &FileDialog::_theme_changed));
mode = FILE_MODE_SAVE_FILE; mode = FILE_MODE_SAVE_FILE;
set_title(RTR("Save a File")); set_title(RTR("Save a File"));
@ -933,11 +933,11 @@ FileDialog::FileDialog() {
makedir->set_text(RTR("Create Folder")); makedir->set_text(RTR("Create Folder"));
makedir->connect("pressed", callable_mp(this, &FileDialog::_make_dir)); makedir->connect("pressed", callable_mp(this, &FileDialog::_make_dir));
hbc->add_child(makedir); hbc->add_child(makedir);
vbc->add_child(hbc); vbox->add_child(hbc);
tree = memnew(Tree); tree = memnew(Tree);
tree->set_hide_root(true); tree->set_hide_root(true);
vbc->add_margin_child(RTR("Directories & Files:"), tree, true); vbox->add_margin_child(RTR("Directories & Files:"), tree, true);
file_box = memnew(HBoxContainer); file_box = memnew(HBoxContainer);
file_box->add_child(memnew(Label(RTR("File:")))); file_box->add_child(memnew(Label(RTR("File:"))));
@ -950,7 +950,7 @@ FileDialog::FileDialog() {
filter->set_h_size_flags(Control::SIZE_EXPAND_FILL); filter->set_h_size_flags(Control::SIZE_EXPAND_FILL);
filter->set_clip_text(true); // too many extensions overflows it filter->set_clip_text(true); // too many extensions overflows it
file_box->add_child(filter); file_box->add_child(filter);
vbc->add_child(file_box); vbox->add_child(file_box);
dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES); dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES);
access = ACCESS_RESOURCES; access = ACCESS_RESOURCES;
@ -993,7 +993,6 @@ FileDialog::FileDialog() {
update_dir(); update_dir();
set_hide_on_ok(false); set_hide_on_ok(false);
vbox = vbc;
invalidated = true; invalidated = true;
if (register_func) if (register_func)

1
scene/gui/file_dialog.h
View File

@ -70,7 +70,6 @@ private:
ConfirmationDialog *makedialog; ConfirmationDialog *makedialog;
LineEdit *makedirname; LineEdit *makedirname;
VBoxContainer *vbc;
Button *makedir; Button *makedir;
Access access; Access access;
//Button *action; //Button *action;