asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply a better fix for the EditorFileDialog crash on favorite

Browse source
This commit is contained in:
Michael Alexsander Silva Dias 2019-06-09 17:41:45 -03:00
parent 91b3daa8d6
commit 1f6a590959
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
editor/editor_file_dialog.cpp
View file

@ -140,7 +140,7 @@ void EditorFileDialog::_unhandled_input(const Ref<InputEvent> &p_event) {
handled = true; handled = true;
} }
if (ED_IS_SHORTCUT("file_dialog/toggle_favorite", p_event)) { if (ED_IS_SHORTCUT("file_dialog/toggle_favorite", p_event)) {
_favorite_toggled(favorite->is_pressed()); _favorite_pressed();
handled = true; handled = true;
} }
if (ED_IS_SHORTCUT("file_dialog/toggle_mode", p_event)) { if (ED_IS_SHORTCUT("file_dialog/toggle_mode", p_event)) {
@ -1222,7 +1222,7 @@ void EditorFileDialog::_update_favorites() {
} }
} }
void EditorFileDialog::_favorite_toggled(bool p_toggle) { void EditorFileDialog::_favorite_pressed() {
bool res = access == ACCESS_RESOURCES; bool res = access == ACCESS_RESOURCES;
String cd = get_current_dir(); String cd = get_current_dir();
@ -1253,12 +1253,6 @@ void EditorFileDialog::_favorite_toggled(bool p_toggle) {
_update_favorites(); _update_favorites();
} }
void EditorFileDialog::_favorite_pressed() {
favorite->set_pressed(!favorite->is_pressed());
_favorite_toggled(favorite->is_pressed());
}
void EditorFileDialog::_recent_selected(int p_idx) { void EditorFileDialog::_recent_selected(int p_idx) {
Vector<String> recentd = EditorSettings::get_singleton()->get_recent_dirs(); Vector<String> recentd = EditorSettings::get_singleton()->get_recent_dirs();
@ -1381,7 +1375,6 @@ void EditorFileDialog::_bind_methods() {
ClassDB::bind_method(D_METHOD("_go_forward"), &EditorFileDialog::_go_forward); ClassDB::bind_method(D_METHOD("_go_forward"), &EditorFileDialog::_go_forward);
ClassDB::bind_method(D_METHOD("_go_up"), &EditorFileDialog::_go_up); ClassDB::bind_method(D_METHOD("_go_up"), &EditorFileDialog::_go_up);
ClassDB::bind_method(D_METHOD("_favorite_toggled"), &EditorFileDialog::_favorite_toggled);
ClassDB::bind_method(D_METHOD("_favorite_pressed"), &EditorFileDialog::_favorite_pressed); ClassDB::bind_method(D_METHOD("_favorite_pressed"), &EditorFileDialog::_favorite_pressed);
ClassDB::bind_method(D_METHOD("_favorite_selected"), &EditorFileDialog::_favorite_selected); ClassDB::bind_method(D_METHOD("_favorite_selected"), &EditorFileDialog::_favorite_selected);
ClassDB::bind_method(D_METHOD("_favorite_move_up"), &EditorFileDialog::_favorite_move_up); ClassDB::bind_method(D_METHOD("_favorite_move_up"), &EditorFileDialog::_favorite_move_up);
@ -1523,7 +1516,6 @@ EditorFileDialog::EditorFileDialog() {
pathhb->add_child(refresh); pathhb->add_child(refresh);
favorite = memnew(ToolButton); favorite = memnew(ToolButton);
favorite->set_flat(true);
favorite->set_toggle_mode(true); favorite->set_toggle_mode(true);
favorite->set_tooltip(TTR("(Un)favorite current folder.")); favorite->set_tooltip(TTR("(Un)favorite current folder."));
favorite->connect("pressed", this, "_favorite_pressed"); favorite->connect("pressed", this, "_favorite_pressed");

1
editor/editor_file_dialog.h
View file

@ -150,7 +150,6 @@ private:
void update_filters(); void update_filters();
void _update_favorites(); void _update_favorites();
void _favorite_toggled(bool p_toggle);
void _favorite_pressed(); void _favorite_pressed();
void _favorite_selected(int p_idx); void _favorite_selected(int p_idx);
void _favorite_move_up(); void _favorite_move_up();