diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-01-08 13:34:12 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-01-08 22:46:09 +0000 |
| commit | 8a23da3fd2a1f730128c0c0a1baef2dcd7b13812 (patch) | |
| tree | 0cf7e71eb2f02c36b1aa23291164cd9b35ee05f3 /ui/qt/main_welcome.cpp | |
| parent | 308b653da2afd05f62b944dda965d45650b23cf4 (diff) | |
Revert "Qt: Try to fix Main Welcome Interfaces List Scrollbar"
Instead of calling InterfaceTree::reset (which clears our selection)
when we resize, just pass our resize event to QTreeWidget.
Additionally, select our default interface using setCurrentItem. This
fixes behavior broken in gb152ca3.
This reverts commit 7baac67149a68b66087c5d688dbeda2869485765.
Bug: 11733
Change-Id: I58855de38561fcb6984273ae3910c0dfcda04e69
Reviewed-on: https://code.wireshark.org/review/13135
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/main_welcome.cpp')
| -rw-r--r-- | ui/qt/main_welcome.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp index 1e20dbc229..236ae9f397 100644 --- a/ui/qt/main_welcome.cpp +++ b/ui/qt/main_welcome.cpp @@ -180,8 +180,6 @@ MainWelcome::MainWelcome(QWidget *parent) : connect(welcome_ui_->captureFilterComboBox, SIGNAL(startCapture()), this, SIGNAL(startCapture())); connect(recent_files_, SIGNAL(itemActivated(QListWidgetItem *)), this, SLOT(openRecentItem(QListWidgetItem *))); - connect(welcome_ui_->openFrame, SIGNAL(animationFinished()), - welcome_ui_->interfaceTree, SLOT(reset())); updateRecentFiles(); #if !defined(Q_OS_MAC) || QT_VERSION > QT_VERSION_CHECK(5, 0, 0) @@ -341,7 +339,6 @@ void MainWelcome::resizeEvent(QResizeEvent *event) // event->accept(); QFrame::resizeEvent(event); - welcome_ui_->interfaceTree->reset(); } void MainWelcome::changeEvent(QEvent* event) |