diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-16 16:44:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-16 16:44:48 +0200 |
| commit | e20fb10d35fad895f1150232f99448e4812643ae (patch) | |
| tree | ac0ad691766c881db0ef58e19b0f9aa8a2467f84 | |
| parent | 053808e194cf869280eccfea5fa50aff55e7e03f (diff) | |
| parent | be8dc97be7c2c735728f282ecbbf9b97b1359a67 (diff) | |
Merge pull request #28913 from YeldhamDev/filesystem_open_regression
Fix leftover connection to the "Open" signal in FileSystemDock
| -rw-r--r-- | editor/editor_node.cpp | 1 | ||||
| -rw-r--r-- | scene/gui/line_edit.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index fed1f6b4fa..68ebaf1226 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -5997,7 +5997,6 @@ EditorNode::EditorNode() { node_dock = memnew(NodeDock); filesystem_dock = memnew(FileSystemDock(this)); - filesystem_dock->connect("open", this, "open_request"); filesystem_dock->connect("inherit", this, "_inherit_request"); filesystem_dock->connect("instance", this, "_instance_request"); filesystem_dock->connect("display_mode_changed", this, "_save_docks"); diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index b10ddfaf70..2d18a80833 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -613,7 +613,7 @@ void LineEdit::_notification(int p_what) { #endif case NOTIFICATION_RESIZED: { - window_pos = 0; //force scroll back since it's expanding to text length + window_pos = 0; set_cursor_position(get_cursor_position()); } break; |