From e6e8995e5124c79df1e26c724acf9f17d2b21471 Mon Sep 17 00:00:00 2001 From: tsic404 Date: Tue, 30 Jan 2024 12:00:39 +0800 Subject: [PATCH] fix: dock plugin calculated to an incorrect size set minSize only for uosai log: as title issue: https://github.com/linuxdeepin/developer-center/issues/7127 --- frame/window/quickpluginwindow.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/frame/window/quickpluginwindow.cpp b/frame/window/quickpluginwindow.cpp index af923d16b..2efa8e133 100644 --- a/frame/window/quickpluginwindow.cpp +++ b/frame/window/quickpluginwindow.cpp @@ -710,8 +710,11 @@ void QuickDockItem::setPosition(Dock::Position position) QWidget *itemWidget = m_pluginItem->itemWidget(m_itemKey); if (itemWidget && m_mainLayout->indexOf(itemWidget) < 0) { auto size= suitableSize(); - auto minSize = std::min(size.height(), size.width()); - itemWidget->setFixedSize(QSize(minSize, minSize)); + if (pluginItem()->pluginName() == QStringLiteral("uosai")) { + auto minSize = std::min(size.height(), size.width()); + size = QSize(minSize, minSize); + } + itemWidget->setFixedSize(size); } } } @@ -882,8 +885,12 @@ void QuickDockItem::showEvent(QShowEvent *event) if (itemWidget && m_mainLayout->indexOf(itemWidget) < 0) { itemWidget->show(); auto size= suitableSize(); - auto minSize = std::min(size.height(), size.width()); - itemWidget->setFixedSize(QSize(minSize, minSize)); + if (pluginItem()->pluginName() == QStringLiteral("uosai")) { + auto minSize = std::min(size.height(), size.width()); + size = QSize(minSize, minSize); + } + itemWidget->setFixedSize(size); + itemWidget->setFixedSize(size); m_mainLayout->addWidget(itemWidget); } }