diff options
| author | Roland Knall <rknall@gmail.com> | 2017-06-19 15:57:04 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-06-19 15:23:15 +0000 |
| commit | d83176ed2edffe59badd75d8ee98c77227fd357f (patch) | |
| tree | c44f2080226d8f21a993911dd904f3a5da00b89b /ui | |
| parent | 193cef0bcbcab25b95b4f124920d004ceaa7ae8a (diff) | |
SearchBar - Focus on shortcut instead of closing
If the searchbar is already open focus on the bar and highlight
existing test, instead of closing an already open bar
Change-Id: I4f8ae2e903cb65c0ebca238f3bcc1c62b63b5c3b
Reviewed-on: https://code.wireshark.org/review/22223
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 6 | ||||
| -rw-r--r-- | ui/qt/search_frame.cpp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index aafee8bcca..dd140229df 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -2116,10 +2116,10 @@ void MainWindow::on_actionEditFindPacket_triggered() } previous_focus_ = wsApp->focusWidget(); connect(previous_focus_, SIGNAL(destroyed()), this, SLOT(resetPreviousFocus())); - showAccordionFrame(main_ui_->searchFrame, true); - if (main_ui_->searchFrame->isVisible()) { - main_ui_->searchFrame->setFocus(); + if (! main_ui_->searchFrame->isVisible()) { + showAccordionFrame(main_ui_->searchFrame, true); } + main_ui_->searchFrame->setFocus(); } void MainWindow::on_actionEditFindNext_triggered() diff --git a/ui/qt/search_frame.cpp b/ui/qt/search_frame.cpp index ffe6c183b1..b1533d4686 100644 --- a/ui/qt/search_frame.cpp +++ b/ui/qt/search_frame.cpp @@ -109,6 +109,7 @@ void SearchFrame::findPrevious() void SearchFrame::setFocus() { sf_ui_->searchLineEdit->setFocus(); + sf_ui_->searchLineEdit->selectAll(); cap_file_->dir = SD_FORWARD; } |