diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2021-06-07 00:24:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 00:24:51 -0500 |
| commit | 679d80841776a774e7d79044210900ab36d9c022 (patch) | |
| tree | 113503d3bfb487624e9a7dd086daa512c46bf78d | |
| parent | 97f3d7a8bc43ee78691153bb60993ba734dbefde (diff) | |
| parent | 4fe4e6ad54b4d4e6a3bbb8d802040f5da5c8c688 (diff) | |
Merge pull request #556 from AttorneyOnline/feature/remember-search
Remember past search term when switching between area and music list
| -rw-r--r-- | include/courtroom.h | 3 | ||||
| -rw-r--r-- | src/courtroom.cpp | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/courtroom.h b/include/courtroom.h index 9da465ab..e8145140 100644 --- a/include/courtroom.h +++ b/include/courtroom.h @@ -588,6 +588,9 @@ private: QString current_background = "default"; QString current_side = ""; + QString last_music_search = ""; + QString last_area_search = ""; + QBrush free_brush; QBrush lfp_brush; QBrush casing_brush; diff --git a/src/courtroom.cpp b/src/courtroom.cpp index a29ebe2f..b2fdc3ca 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -4343,6 +4343,7 @@ void Courtroom::on_music_search_edited(QString p_text) (*it)->setHidden(p_text != ""); ++it; } + last_music_search = p_text; } if (!ui_area_list->isHidden()) { @@ -4351,6 +4352,7 @@ void Courtroom::on_music_search_edited(QString p_text) (*ait)->setHidden(p_text != ""); ++ait; } + last_area_search = p_text; } if (p_text != "") { @@ -5461,16 +5463,20 @@ void Courtroom::on_evidence_button_clicked() void Courtroom::on_switch_area_music_clicked() { - ui_music_search->setText(""); - on_music_search_edited(ui_music_search->text()); if (ui_area_list->isHidden()) { ui_area_list->show(); ui_music_list->hide(); + last_music_search = ui_music_search->text(); + ui_music_search->setText(last_area_search); } else { ui_area_list->hide(); ui_music_list->show(); + last_area_search = ui_music_search->text(); + ui_music_search->setText(last_music_search); } + on_music_search_edited(ui_music_search->text()); + } void Courtroom::ping_server() |