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

disable drop app when already on dock

Browse Source 
Change-Id: I77c5dbe6cd6423fded9edf07cbc8fd589df2cea9
This commit is contained in:
石博文 2016-07-20 16:53:39 +08:00 committed by Hualet Wang
parent 22dfdbf37e
commit 466af2c1aa
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frame/controller/dockitemcontroller.cpp
View File

@ -27,9 +27,9 @@ const QList<DockItem *> DockItemController::itemList() const
return m_itemList;
}
bool DockItemController::appIsDocked(const QString &appDesktop) const
bool DockItemController::appIsOnDock(const QString &appDesktop) const
{
return m_appInter->IsDocked(appDesktop);
return m_appInter->IsOnDock(appDesktop);
}
void DockItemController::itemMove(DockItem * const moveItem, DockItem * const replaceItem)

2
frame/controller/dockitemcontroller.h
View File

@ -20,7 +20,7 @@ public:
~DockItemController();
const QList<DockItem *> itemList() const;
bool appIsDocked(const QString &appDesktop) const;
bool appIsOnDock(const QString &appDesktop) const;
signals:
void itemInserted(const int index, DockItem *item) const;

8
frame/dbus/dbusdock.h
View File

@ -136,6 +136,14 @@ public Q_SLOTS: // METHODS
return asyncCallWithArgumentList(QStringLiteral("IsDocked"), args);
}
inline QDBusPendingReply<bool> IsOnDock(const QString &appDesktop)
{
QList<QVariant> args;
args << appDesktop;
return asyncCallWithArgumentList(QStringLiteral("IsOnDock"), args);
}
inline QDBusPendingReply<bool> RequestUndock(const QString &appDesktop)
{
QList<QVariant> args;

2
frame/panel/mainpanel.cpp
View File

@ -141,7 +141,7 @@ void MainPanel::dragEnterEvent(QDragEnterEvent *e)
if (!e->mimeData()->formats().contains(RequestDockKey))
return;
if (m_itemController->appIsDocked(e->mimeData()->data(RequestDockKey)))
if (m_itemController->appIsOnDock(e->mimeData()->data(RequestDockKey)))
return;
e->accept();