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 on container item

Browse Source 
Change-Id: I4e15374cb900006f820f20dff194e0db69f66140
This commit is contained in:
石博文 2016-08-10 13:43:24 +08:00
parent 26857b0750
commit a775924ee1
Notes: Deepin Code Review 2016-08-10 06:05:12 +00:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: 石博文 <sbw@sbw.so>
Submitted-by: 石博文 <sbw@sbw.so>
Submitted-at: Wed, 10 Aug 2016 06:05:12 +0000
Reviewed-on: https://cr.deepin.io/15070
Project: dde/dde-dock
Branch: refs/heads/master
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frame/item/containeritem.cpp
View File

@ -23,8 +23,6 @@ void ContainerItem::dragEnterEvent(QDragEnterEvent *e)
void ContainerItem::dragMoveEvent(QDragMoveEvent *e)
{
Q_UNUSED(e);
return;
}

6
frame/panel/mainpanel.cpp
View File

@ -135,6 +135,10 @@ void MainPanel::resizeEvent(QResizeEvent *e)
void MainPanel::dragEnterEvent(QDragEnterEvent *e)
{
DockItem *item = itemAt(e->pos());
if (item && item->itemType() == DockItem::Container)
return;
DockItem *dragSourceItem = qobject_cast<DockItem *>(e->source());
if (dragSourceItem)
{
@ -202,7 +206,7 @@ void MainPanel::dragLeaveEvent(QDragLeaveEvent *e)
RequestDockItem = nullptr;
}
if (DragingItem)
if (DragingItem && DragingItem->itemType() != DockItem::Plugins)
DragingItem->hide();
}