From 89ae2826d6158e62fe3db9c18d01721a2168e9cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Fri, 24 Nov 2017 19:17:55 +0100 Subject: Qt: AccordionFrame users keyPressEvent() fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Declare keyPressEvent() virtual. - Give keyPressEvent() to parent when done. Change-Id: If1c05e86a5ab71dd239c025cdb2bcfb1ef484811 Reviewed-on: https://code.wireshark.org/review/24573 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall Reviewed-by: Anders Broman --- ui/qt/column_editor_frame.cpp | 2 ++ ui/qt/column_editor_frame.h | 2 +- ui/qt/filter_expression_frame.cpp | 3 +++ ui/qt/filter_expression_frame.h | 2 +- ui/qt/preference_editor_frame.cpp | 2 ++ ui/qt/preference_editor_frame.h | 2 +- ui/qt/search_frame.cpp | 15 +++++++-------- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ui/qt/column_editor_frame.cpp b/ui/qt/column_editor_frame.cpp index 72dcf8116d..638b32a734 100644 --- a/ui/qt/column_editor_frame.cpp +++ b/ui/qt/column_editor_frame.cpp @@ -184,6 +184,8 @@ void ColumnEditorFrame::keyPressEvent(QKeyEvent *event) } } } + + AccordionFrame::keyPressEvent(event); } /* diff --git a/ui/qt/column_editor_frame.h b/ui/qt/column_editor_frame.h index d2c77baac4..04b715a134 100644 --- a/ui/qt/column_editor_frame.h +++ b/ui/qt/column_editor_frame.h @@ -43,7 +43,7 @@ signals: protected: virtual void showEvent(QShowEvent *event); - void keyPressEvent(QKeyEvent *event); + virtual void keyPressEvent(QKeyEvent *event); private slots: void on_typeComboBox_activated(int index); diff --git a/ui/qt/filter_expression_frame.cpp b/ui/qt/filter_expression_frame.cpp index 942637484d..322c750f0f 100644 --- a/ui/qt/filter_expression_frame.cpp +++ b/ui/qt/filter_expression_frame.cpp @@ -189,7 +189,10 @@ void FilterExpressionFrame::keyPressEvent(QKeyEvent *event) } } } + + AccordionFrame::keyPressEvent(event); } + /* * Editor modelines * diff --git a/ui/qt/filter_expression_frame.h b/ui/qt/filter_expression_frame.h index 13f5546d69..8394537a59 100644 --- a/ui/qt/filter_expression_frame.h +++ b/ui/qt/filter_expression_frame.h @@ -47,7 +47,7 @@ signals: protected: virtual void showEvent(QShowEvent *event); - void keyPressEvent(QKeyEvent *event); + virtual void keyPressEvent(QKeyEvent *event); private: Ui::FilterExpressionFrame *ui; diff --git a/ui/qt/preference_editor_frame.cpp b/ui/qt/preference_editor_frame.cpp index 1ae604ec52..e3b522d9af 100644 --- a/ui/qt/preference_editor_frame.cpp +++ b/ui/qt/preference_editor_frame.cpp @@ -261,6 +261,8 @@ void PreferenceEditorFrame::keyPressEvent(QKeyEvent *event) } } } + + AccordionFrame::keyPressEvent(event); } /* diff --git a/ui/qt/preference_editor_frame.h b/ui/qt/preference_editor_frame.h index 3c1b6b9463..f4f4947747 100644 --- a/ui/qt/preference_editor_frame.h +++ b/ui/qt/preference_editor_frame.h @@ -49,7 +49,7 @@ signals: protected: virtual void showEvent(QShowEvent *event); - void keyPressEvent(QKeyEvent *event); + virtual void keyPressEvent(QKeyEvent *event); private slots: // Similar to ModulePreferencesScrollArea diff --git a/ui/qt/search_frame.cpp b/ui/qt/search_frame.cpp index b1533d4686..f63f63ff1a 100644 --- a/ui/qt/search_frame.cpp +++ b/ui/qt/search_frame.cpp @@ -134,16 +134,15 @@ void SearchFrame::findFrameWithFilter(QString &filter) void SearchFrame::keyPressEvent(QKeyEvent *event) { - if (wsApp->focusWidget() == sf_ui_->searchLineEdit) { - if (event->modifiers() == Qt::NoModifier) { - if (event->key() == Qt::Key_Escape) { - on_cancelButton_clicked(); - } else if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) { - on_findButton_clicked(); - } + if (event->modifiers() == Qt::NoModifier) { + if (event->key() == Qt::Key_Escape) { + on_cancelButton_clicked(); + } else if (event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) { + on_findButton_clicked(); } - return; // searchLineEdit didn't want it and we don't either. } + + AccordionFrame::keyPressEvent(event); } bool SearchFrame::regexCompile() -- cgit v1.2.3