From 8a23da3fd2a1f730128c0c0a1baef2dcd7b13812 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 8 Jan 2016 13:34:12 -0800 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- ui/qt/main_welcome.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'ui/qt/main_welcome.cpp') 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) -- cgit v1.2.3