From 435962a9aedf5a543b25259e20637e42b6175b76 Mon Sep 17 00:00:00 2001 From: Daozhong Ma Date: Sun, 31 Dec 2023 06:35:37 +0000 Subject: [PATCH] Fix addressbar dropdown is compressed BUG: 478748 --- .../completer/locationcompleterview.cpp | 30 ++----------------- .../completer/locationcompleterview.h | 3 -- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/src/lib/navigation/completer/locationcompleterview.cpp b/src/lib/navigation/completer/locationcompleterview.cpp index 544f71842..91194c032 100644 --- a/src/lib/navigation/completer/locationcompleterview.cpp +++ b/src/lib/navigation/completer/locationcompleterview.cpp @@ -119,35 +119,10 @@ void LocationCompleterView::adjustSize() const int maxItemsCount = 12; const int newHeight = m_view->sizeHintForRow(0) * qMin(maxItemsCount, model()->rowCount()) + 2 * m_view->frameWidth(); - if (!m_resizeTimer) { - m_resizeTimer = new QTimer(this); - m_resizeTimer->setInterval(200); - connect(m_resizeTimer, &QTimer::timeout, this, [this]() { - if (m_resizeHeight > 0) { - m_view->setFixedHeight(m_resizeHeight); - setFixedHeight(sizeHint().height()); - } - m_resizeHeight = -1; - }); - } - - if (!m_forceResize) { - if (newHeight == m_resizeHeight) { - return; - } else if (newHeight == m_view->height()) { - m_resizeHeight = -1; - return; - } else if (newHeight < m_view->height()) { - m_resizeHeight = newHeight; - m_resizeTimer->start(); - return; - } - } - - m_resizeHeight = -1; - m_forceResize = false; m_view->setFixedHeight(newHeight); + setMaximumHeight(sizeHint().height()); setFixedHeight(sizeHint().height()); + resize(width(), sizeHint().height()); } bool LocationCompleterView::eventFilter(QObject* object, QEvent* event) @@ -370,7 +345,6 @@ void LocationCompleterView::close() hide(); m_view->verticalScrollBar()->setValue(0); m_delegate->setForceVisitItem(false); - m_forceResize = true; Q_EMIT closed(); } diff --git a/src/lib/navigation/completer/locationcompleterview.h b/src/lib/navigation/completer/locationcompleterview.h index ebe1de4e1..df3dd479b 100644 --- a/src/lib/navigation/completer/locationcompleterview.h +++ b/src/lib/navigation/completer/locationcompleterview.h @@ -66,9 +66,6 @@ private: QListView *m_view; LocationCompleterDelegate *m_delegate; QHBoxLayout *m_searchEnginesLayout; - int m_resizeHeight = -1; - QTimer *m_resizeTimer = nullptr; - bool m_forceResize = true; }; #endif // LOCATIONCOMPLETERVIEW_H