Merge branch 'Chatterino:master' into chatterino7

SevenTV · Dec 4, 2022 · 8f57d63 · 8f57d63
2 parents f3fd698 + 4fa214a
commit 8f57d63
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unversioned
 
+- Minor: Search window input will automatically use currently selected text if present. (#4178)
 - Minor: Cleared up highlight sound settings (#4194)
 - Bugfix: Fixed highlight sounds not reloading on change properly. (#4194)
 - Bugfix: Fixed CTRL + C not working in reply thread popups. (#4209)

diff --git a/src/widgets/helper/SearchPopup.cpp b/src/widgets/helper/SearchPopup.cpp
@@ -62,6 +62,12 @@ SearchPopup::SearchPopup(QWidget *parent, Split *split)
     , split_(split)
 {
     this->initLayout();
+    if (this->split_ && this->split_->getChannelView().hasSelection())
+    {
+        this->searchInput_->setText(
+            this->split_->getChannelView().getSelectedText().trimmed());
+        this->searchInput_->selectAll();
+    }
     this->resize(400, 600);
     this->addShortcuts();
 }