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

Change add spacing item way

Browse Source
This commit is contained in:
杨万青 2015-06-30 23:37:14 +08:00
parent c06ed28b6f
commit 8861dfbe7d
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dde-dock/src/Panel/panel.cpp
View File

@ -90,7 +90,6 @@ void Panel::slotEnteredMask()
void Panel::slotExitedMask()
{
leftLayout->addSpacingItem();
// leftLayout->relayout();
}

29
dde-dock/src/Widgets/docklayout.cpp
View File

@ -126,6 +126,23 @@ void DockLayout::sortBottomToTop()
}
bool DockLayout::hasSpacingItemInList()
{
if (appList.count() <= 1)
return false;
if (appList.at(0)->x() > itemSpacing)
return true;
for (int i = 1; i < appList.count(); i ++)
{
if (appList.at(i)->x() - itemSpacing != appList.at(i - 1)->x() + appList.at(i - 1)->width())
{
return true;
}
}
return false;
}
int DockLayout::indexOf(AbstractDockItem *item)
{
return appList.indexOf(item);
@ -164,7 +181,7 @@ void DockLayout::addSpacingItem()
return;
AbstractDockItem *tmpItem = tmpAppMap.firstKey();
for (int i = appList.count() -1;i > lastHoverIndex; i-- )
for (int i = appList.count() -1;i >= lastHoverIndex; i-- )
{
AbstractDockItem *targetItem = appList.at(i);
targetItem->setNextPos(targetItem->x() + tmpItem->width() + itemSpacing,0);
@ -242,6 +259,14 @@ void DockLayout::slotItemEntered(QDragEnterEvent *)
AbstractDockItem *item = qobject_cast<AbstractDockItem*>(sender());
int tmpIndex = indexOf(item);
lastHoverIndex = tmpIndex;
qWarning() << "========" << lastHoverIndex;
if (!hasSpacingItemInList())
{
addSpacingItem();
return;
}
QPoint tmpPos = QCursor::pos();
if (tmpPos.x() - m_lastPost.x() == 0)
@ -262,7 +287,6 @@ void DockLayout::slotItemEntered(QDragEnterEvent *)
}
m_lastPost = tmpPos;
lastHoverIndex = tmpIndex;
if (!tmpAppMap.isEmpty())
{
@ -275,6 +299,7 @@ void DockLayout::slotItemEntered(QDragEnterEvent *)
{
targetItem->setNextPos(QPoint(targetItem->x() - tmpAppMap.firstKey()->width() - itemSpacing,0));
}
QPropertyAnimation *animation = new QPropertyAnimation(targetItem, "pos");
animation->setStartValue(targetItem->pos());
animation->setEndValue(targetItem->getNextPos());

4
dde-dock/src/Widgets/docklayout.h
View File

@ -41,7 +41,6 @@ public:
int indexOf(AbstractDockItem * item);
int indexOf(int x,int y);
void relayout();
void addSpacingItem();
void dragoutFromLayout(int index);
signals:
@ -64,6 +63,9 @@ private:
void sortTopToBottom();
void sortBottomToTop();
void addSpacingItem();
bool hasSpacingItemInList();
private:
QList<AbstractDockItem *> appList;
QMap<AbstractDockItem *,int> tmpAppMap;//only one item inside

2
dde-dock/src/mainwidget.cpp
View File

@ -12,7 +12,7 @@ MainWidget::MainWidget(QWidget *parent)
this->setWindowFlags(Qt::ToolTip);
this->setAttribute(Qt::WA_TranslucentBackground);
this->move(0,800);
this->move(0,rec.height() - 100);
}
MainWidget::~MainWidget()