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

Merge pull request #29629 from volzhs/editor-file-dialog

Browse source 
Fix crash when selecting favorate directory on EditorFileDialog
This commit is contained in:
Gilles Roudière 2019-06-09 18:13:46 +02:00 committed by GitHub
commit 91b3daa8d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
editor/editor_file_dialog.cpp
View file

@ -1253,6 +1253,12 @@ 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();
@ -1376,6 +1382,7 @@ void EditorFileDialog::_bind_methods() {
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_toggled"), &EditorFileDialog::_favorite_toggled);
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);
ClassDB::bind_method(D_METHOD("_favorite_move_down"), &EditorFileDialog::_favorite_move_down); ClassDB::bind_method(D_METHOD("_favorite_move_down"), &EditorFileDialog::_favorite_move_down);
@ -1519,7 +1526,7 @@ EditorFileDialog::EditorFileDialog() {
favorite->set_flat(true); 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("toggled", this, "_favorite_toggled"); favorite->connect("pressed", this, "_favorite_pressed");
pathhb->add_child(favorite); pathhb->add_child(favorite);
Ref<ButtonGroup> view_mode_group; Ref<ButtonGroup> view_mode_group;

1
editor/editor_file_dialog.h
View file

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