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

feat:trash plugin can uninstall app

Browse Source 
支持在启动器全屏的时候，拖动app到任务栏的垃圾桶插件图标上提示卸载应用(修复插件不能移动位置的问题)
This commit is contained in:
fanpengcheng_cm 2020-03-09 11:06:03 +08:00
parent 0bd6a5a6d3
commit b10d849939
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
frame/panel/mainpanelcontrol.cpp
View File

@ -27,6 +27,7 @@
#include "../item/appitem.h" #include "../item/appitem.h"
#include "../item/pluginsitem.h" #include "../item/pluginsitem.h"
#include "../item/traypluginitem.h" #include "../item/traypluginitem.h"
#include "../controller/dockitemmanager.h"
#include <QDrag> #include <QDrag>
#include <QTimer> #include <QTimer>
@ -34,6 +35,7 @@
#include <QString> #include <QString>
#include <QApplication> #include <QApplication>
#include <QGSettings> #include <QGSettings>
#include <QPointer>
#include <DGuiApplicationHelper> #include <DGuiApplicationHelper>
#include <DWindowManagerHelper> #include <DWindowManagerHelper>
@ -149,7 +151,7 @@ void MainPanelControl::onGSettingsChanged(const QString &key)
if (setting->keys().contains("enable")) { if (setting->keys().contains("enable")) {
const bool isEnable = GSettingsByLaunch()->keys().contains("enable") && GSettingsByLaunch()->get("enable").toBool(); const bool isEnable = GSettingsByLaunch()->keys().contains("enable") && GSettingsByLaunch()->get("enable").toBool();
if(isEnable && setting->get("enable").toBool()){ if (isEnable && setting->get("enable").toBool()) {
m_fixedAreaWidget->setVisible(true); m_fixedAreaWidget->setVisible(true);
m_fixedSpliter->setVisible(true); m_fixedSpliter->setVisible(true);
m_isEnableLaunch = true; m_isEnableLaunch = true;
@ -365,7 +367,16 @@ void MainPanelControl::moveItem(DockItem *sourceItem, DockItem *targetItem)
void MainPanelControl::dragEnterEvent(QDragEnterEvent *e) void MainPanelControl::dragEnterEvent(QDragEnterEvent *e)
{ {
if(!m_pluginAreaWidget->geometry().contains(e->pos())) QRect rect = QRect();
foreach (auto item, DockItemManager::instance()->itemList()) {
DockItem *dockItem = item.data();
PluginsItem *pluginItem = qobject_cast<PluginsItem *>(dockItem);
if (pluginItem && pluginItem->pluginName() == "trash") {
rect = pluginItem->geometry();
}
}
if (!rect.contains(e->pos()))
e->accept(); e->accept();
} }
@ -481,7 +492,7 @@ void MainPanelControl::dragMoveEvent(QDragMoveEvent *e)
const char *RequestDockKey = "RequestDock"; const char *RequestDockKey = "RequestDock";
const char *RequestDockKeyFallback = "text/plain"; const char *RequestDockKeyFallback = "text/plain";
const char *DesktopMimeType = "application/x-desktop"; const char *DesktopMimeType = "application/x-desktop";
auto DragmineData=e->mimeData(); auto DragmineData = e->mimeData();
m_draggingMimeKey = DragmineData->formats().contains(RequestDockKey) ? RequestDockKey : RequestDockKeyFallback; m_draggingMimeKey = DragmineData->formats().contains(RequestDockKey) ? RequestDockKey : RequestDockKeyFallback;
@ -783,8 +794,9 @@ void MainPanelControl::itemUpdated(DockItem *item)
resizeDockIcon(); resizeDockIcon();
} }
void MainPanelControl::showEvent(QShowEvent* event) { void MainPanelControl::showEvent(QShowEvent *event)
QTimer::singleShot(0, this, [=] { {
QTimer::singleShot(0, this, [ = ] {
onGSettingsChanged("enable"); onGSettingsChanged("enable");
}); });
@ -803,7 +815,7 @@ void MainPanelControl::paintEvent(QPaintEvent *event)
painter.setOpacity(0.1); painter.setOpacity(0.1);
} }
if(m_isEnableLaunch) if (m_isEnableLaunch)
painter.fillRect(m_fixedSpliter->geometry(), color); painter.fillRect(m_fixedSpliter->geometry(), color);
painter.fillRect(m_appSpliter->geometry(), color); painter.fillRect(m_appSpliter->geometry(), color);
painter.fillRect(m_traySpliter->geometry(), color); painter.fillRect(m_traySpliter->geometry(), color);