diff --git a/frame/window/quickpluginwindow.cpp b/frame/window/quickpluginwindow.cpp index f83b0f9c3..af923d16b 100644 --- a/frame/window/quickpluginwindow.cpp +++ b/frame/window/quickpluginwindow.cpp @@ -23,6 +23,8 @@ #include #include #include +#include +#include #define ITEMSIZE 22 #define STARTSPACE 6 @@ -707,7 +709,9 @@ void QuickDockItem::setPosition(Dock::Position position) if (m_mainLayout) { QWidget *itemWidget = m_pluginItem->itemWidget(m_itemKey); if (itemWidget && m_mainLayout->indexOf(itemWidget) < 0) { - itemWidget->setFixedSize(suitableSize()); + auto size= suitableSize(); + auto minSize = std::min(size.height(), size.width()); + itemWidget->setFixedSize(QSize(minSize, minSize)); } } } @@ -877,7 +881,9 @@ void QuickDockItem::showEvent(QShowEvent *event) QWidget *itemWidget = m_pluginItem->itemWidget(m_itemKey); if (itemWidget && m_mainLayout->indexOf(itemWidget) < 0) { itemWidget->show(); - itemWidget->setFixedSize(suitableSize()); + auto size= suitableSize(); + auto minSize = std::min(size.height(), size.width()); + itemWidget->setFixedSize(QSize(minSize, minSize)); m_mainLayout->addWidget(itemWidget); } } diff --git a/plugins/pluginmanager/quicksettingitem.cpp b/plugins/pluginmanager/quicksettingitem.cpp index db6289564..36f3a957b 100644 --- a/plugins/pluginmanager/quicksettingitem.cpp +++ b/plugins/pluginmanager/quicksettingitem.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #define ICONWIDTH 24 #define ICONHEIGHT 24 @@ -115,6 +116,7 @@ QColor QuickSettingItem::foregroundColor() const QuickSettingItem *QuickSettingFactory::createQuickWidget(PluginsItemInterface * const pluginInter, const QString &itemKey) { + if (pluginInter->pluginName() == QStringLiteral("uosai")) return nullptr; // 如果显示在面板的图标或者Widget为空,则不让显示(例如电池插件) if (!(pluginInter->flags() & PluginFlag::Type_Common)) return nullptr;