Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-02 15:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: tmp blocked uosai plugin in quickpanel

Browse Source 
log: as title
This commit is contained in:
tsic404 2024-01-26 11:57:28 +08:00 committed by Tsic
parent 572c0c8aad
commit b4ec458dd5
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frame/window/quickpluginwindow.cpp
View File

@ -23,6 +23,8 @@
#include <QGuiApplication> #include <QGuiApplication>
#include <QMenu> #include <QMenu>
#include <QDragLeaveEvent> #include <QDragLeaveEvent>
#include <algorithm>
#include <QSize>
#define ITEMSIZE 22 #define ITEMSIZE 22
#define STARTSPACE 6 #define STARTSPACE 6
@ -707,7 +709,9 @@ void QuickDockItem::setPosition(Dock::Position position)
if (m_mainLayout) { if (m_mainLayout) {
QWidget *itemWidget = m_pluginItem->itemWidget(m_itemKey); QWidget *itemWidget = m_pluginItem->itemWidget(m_itemKey);
if (itemWidget && m_mainLayout->indexOf(itemWidget) < 0) { 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); QWidget *itemWidget = m_pluginItem->itemWidget(m_itemKey);
if (itemWidget && m_mainLayout->indexOf(itemWidget) < 0) { if (itemWidget && m_mainLayout->indexOf(itemWidget) < 0) {
itemWidget->show(); 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); m_mainLayout->addWidget(itemWidget);
} }
} }

2
plugins/pluginmanager/quicksettingitem.cpp
View File

@ -38,6 +38,7 @@
#include <QPushButton> #include <QPushButton>
#include <QFontMetrics> #include <QFontMetrics>
#include <QPainter> #include <QPainter>
#include <QStringLiteral>
#define ICONWIDTH 24 #define ICONWIDTH 24
#define ICONHEIGHT 24 #define ICONHEIGHT 24
@ -115,6 +116,7 @@ QColor QuickSettingItem::foregroundColor() const
QuickSettingItem *QuickSettingFactory::createQuickWidget(PluginsItemInterface * const pluginInter, const QString &itemKey) QuickSettingItem *QuickSettingFactory::createQuickWidget(PluginsItemInterface * const pluginInter, const QString &itemKey)
{ {
if (pluginInter->pluginName() == QStringLiteral("uosai")) return nullptr;
// 如果显示在面板的图标或者Widget为空，则不让显示(例如电池插件) // 如果显示在面板的图标或者Widget为空，则不让显示(例如电池插件)
if (!(pluginInter->flags() & PluginFlag::Type_Common)) if (!(pluginInter->flags() & PluginFlag::Type_Common))
return nullptr; return nullptr;