Skip to content

Commit

Permalink
Restore previous scroll position when reopening the search help dialo…
Browse files Browse the repository at this point in the history
…g with a old search
  • Loading branch information
YeldhamDev committed Nov 26, 2018
1 parent 942855a commit 78b9b7c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
13 changes: 11 additions & 2 deletions editor/editor_help_search.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,15 @@ void EditorHelpSearch::_notification(int p_what) {
if (search.is_valid()) {
if (search->work()) {
// Search done.

// Only point to the perfect match if it's a new search, and not just reopening a old one.
if (!old_search)
results_tree->ensure_cursor_is_visible();
else
old_search = false;

get_ok()->set_disabled(!results_tree->get_selected());

search = Ref<Runner>();
set_process(false);
}
Expand Down Expand Up @@ -177,6 +185,7 @@ void EditorHelpSearch::popup_dialog(const String &p_term) {
if (p_term == "") {
search_box->clear();
} else {
old_search = true;
search_box->set_text(p_term);
search_box->select_all();
}
Expand All @@ -186,6 +195,8 @@ void EditorHelpSearch::popup_dialog(const String &p_term) {

EditorHelpSearch::EditorHelpSearch() {

old_search = false;

set_hide_on_ok(false);
set_resizable(true);
set_title(TTR("Search Help"));
Expand Down Expand Up @@ -406,8 +417,6 @@ bool EditorHelpSearch::Runner::_phase_select_match() {

if (matched_item)
matched_item->select(0);
results_tree->ensure_cursor_is_visible();

return true;
}

Expand Down
1 change: 1 addition & 0 deletions editor/editor_help_search.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class EditorHelpSearch : public ConfirmationDialog {
ToolButton *hierarchy_button;
OptionButton *filter_combo;
Tree *results_tree;
bool old_search;

class Runner;
Ref<Runner> search;
Expand Down

0 comments on commit 78b9b7c

Please sign in to comment.