Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: 任务栏插件显示大小新增支持自定义宽度(或高度)"

Browse Source 
This reverts commit 81d9d8635c6032b94d4c7eec3d29edaf84857bd5.
This commit is contained in:
Fanpengcheng 2020-11-06 15:28:56 +08:00
parent 81d9d8635c
commit 4b20ba24a3
6 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frame/item/pluginsitem.cpp
View File

@ -99,11 +99,6 @@ QString PluginsItem::pluginName() const
return m_pluginInter->pluginName(); return m_pluginInter->pluginName();
} }
PluginsItemInterface::PluginSizePolicy PluginsItem::pluginSizePolicy() const
{
return m_pluginInter->pluginSizePolicy();
}
DockItem::ItemType PluginsItem::itemType() const DockItem::ItemType PluginsItem::itemType() const
{ {
if (m_pluginInter->type() == PluginsItemInterface::Normal) { if (m_pluginInter->type() == PluginsItemInterface::Normal) {

1
frame/item/pluginsitem.h
View File

@ -41,7 +41,6 @@ public:
void setInContainer(const bool container); void setInContainer(const bool container);
QString pluginName() const; QString pluginName() const;
PluginsItemInterface::PluginSizePolicy pluginSizePolicy() const;
using DockItem::showContextMenu; using DockItem::showContextMenu;
using DockItem::hidePopup; using DockItem::hidePopup;

18
frame/panel/mainpanelcontrol.cpp
View File

@ -1058,13 +1058,10 @@ void MainPanelControl::calcuDockIconSize(int w, int h, PluginsItem *trashPlugin,
if (layout) { if (layout) {
PluginsItem *pItem = static_cast<PluginsItem *>(layout->itemAt(0)->widget()); PluginsItem *pItem = static_cast<PluginsItem *>(layout->itemAt(0)->widget());
if (pItem && pItem != trashPlugin && pItem != shutdownPlugin && pItem != keyboardPlugin && pItem !=notificationPlugin) { if (pItem && pItem != trashPlugin && pItem != shutdownPlugin && pItem != keyboardPlugin && pItem !=notificationPlugin) {
switch (pItem->pluginSizePolicy()) { if (pItem->pluginName() == "datetime") {
case PluginsItemInterface::System:
pItem->setFixedSize(tray_item_size, tray_item_size);
break;
case PluginsItemInterface::Custom:
pItem->setFixedSize(pItem->sizeHint().width(), h); pItem->setFixedSize(pItem->sizeHint().width(), h);
break; } else {
pItem->setFixedSize(tray_item_size, tray_item_size);
} }
} }
} }
@ -1076,13 +1073,10 @@ void MainPanelControl::calcuDockIconSize(int w, int h, PluginsItem *trashPlugin,
if (layout) { if (layout) {
PluginsItem *pItem = static_cast<PluginsItem *>(layout->itemAt(0)->widget()); PluginsItem *pItem = static_cast<PluginsItem *>(layout->itemAt(0)->widget());
if (pItem && pItem != trashPlugin && pItem != shutdownPlugin && pItem != keyboardPlugin && pItem !=notificationPlugin) { if (pItem && pItem != trashPlugin && pItem != shutdownPlugin && pItem != keyboardPlugin && pItem !=notificationPlugin) {
switch (pItem->pluginSizePolicy()) { if (pItem->pluginName() == "datetime") {
case PluginsItemInterface::System:
pItem->setFixedSize(tray_item_size, tray_item_size);
break;
case PluginsItemInterface::Custom:
pItem->setFixedSize(w, pItem->sizeHint().height()); pItem->setFixedSize(w, pItem->sizeHint().height());
break; } else {
pItem->setFixedSize(tray_item_size, tray_item_size);
} }
} }
} }

14
interfaces/pluginsiteminterface.h
View File

@ -40,14 +40,6 @@ public:
Fixed Fixed
}; };
/**
* @brief Plugin size policy
*/
enum PluginSizePolicy {
System = 1 << 0, // Follow the system
Custom = 1 << 1 // The custom
};
/// ///
/// \brief ~PluginsItemInterface /// \brief ~PluginsItemInterface
/// DON'T try to delete m_proxyInter. /// DON'T try to delete m_proxyInter.
@ -237,12 +229,6 @@ public:
/// ///
virtual PluginType type() { return Normal; } virtual PluginType type() { return Normal; }
///
/// \brief plugin size policy
/// default plugin size policy
///
virtual PluginSizePolicy pluginSizePolicy() const { return System; }
protected: protected:
/// ///
/// \brief m_proxyInter /// \brief m_proxyInter

5
plugins/datetime/datetimeplugin.cpp
View File

@ -47,11 +47,6 @@ const QString DatetimePlugin::pluginName() const
return "datetime"; return "datetime";
} }
PluginsItemInterface::PluginSizePolicy DatetimePlugin::pluginSizePolicy() const
{
return PluginsItemInterface::Custom;
}
const QString DatetimePlugin::pluginDisplayName() const const QString DatetimePlugin::pluginDisplayName() const
{ {
return tr("Datetime"); return tr("Datetime");

1
plugins/datetime/datetimeplugin.h
View File

@ -43,7 +43,6 @@ public:
explicit DatetimePlugin(QObject *parent = nullptr); explicit DatetimePlugin(QObject *parent = nullptr);
const QString pluginName() const override; const QString pluginName() const override;
PluginSizePolicy pluginSizePolicy() const override;
const QString pluginDisplayName() const override; const QString pluginDisplayName() const override;
void init(PluginProxyInterface *proxyInter) override; void init(PluginProxyInterface *proxyInter) override;