diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-28 00:09:46 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-28 07:47:28 +0000 |
| commit | 8f96d5358ba0dd8cf8cd5d134440361f9478e032 (patch) | |
| tree | 10d730beb8004ee54920a25240809b16b26f8e5c | |
| parent | afb7b42360991f38fda3962eb6899562a2d75d6d (diff) | |
| download | wireshark-8f96d5358ba0dd8cf8cd5d134440361f9478e032.tar.gz | |
Qt: set focus to text box when opening search frame
Change-Id: Iac932365bc2fa7a5d5102a5f5455ea01daa86590
Reviewed-on: https://code.wireshark.org/review/12236
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
(cherry picked from commit 75da6960e0c6a933e4459249113716c4137cd386)
Reviewed-on: https://code.wireshark.org/review/12242
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 3 | ||||
| -rw-r--r-- | ui/qt/search_frame.cpp | 10 | ||||
| -rw-r--r-- | ui/qt/search_frame.h | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 5773f28185..60930af54c 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -1887,6 +1887,9 @@ 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(); + } } void MainWindow::on_actionEditFindNext_triggered() diff --git a/ui/qt/search_frame.cpp b/ui/qt/search_frame.cpp index 16c64f2c96..6fe3f2de03 100644 --- a/ui/qt/search_frame.cpp +++ b/ui/qt/search_frame.cpp @@ -72,9 +72,9 @@ SearchFrame::~SearchFrame() void SearchFrame::animatedShow() { - sf_ui_->searchLineEdit->setFocus(); - AccordionFrame::animatedShow(); + + sf_ui_->searchLineEdit->setFocus(); } void SearchFrame::findNext() @@ -101,6 +101,12 @@ void SearchFrame::findPrevious() on_findButton_clicked(); } +void SearchFrame::setFocus() +{ + sf_ui_->searchLineEdit->setFocus(); + cap_file_->dir = SD_FORWARD; +} + void SearchFrame::setCaptureFile(capture_file *cf) { cap_file_ = cf; diff --git a/ui/qt/search_frame.h b/ui/qt/search_frame.h index e515a57096..9ba8c62c1c 100644 --- a/ui/qt/search_frame.h +++ b/ui/qt/search_frame.h @@ -42,6 +42,7 @@ public: void animatedShow(); void findNext(); void findPrevious(); + void setFocus(); public slots: void setCaptureFile(capture_file *cf); |