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

Merge "support item sort key"

Browse Source
This commit is contained in:
石博文 2016-08-08 13:47:19 +00:00 committed by Deepin Code Review
commit 2fc754cb13
4 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
frame/controller/dockitemcontroller.cpp
View File

@ -32,6 +32,19 @@ bool DockItemController::appIsOnDock(const QString &appDesktop) const
return m_appInter->IsOnDock(appDesktop);
}
void DockItemController::updatePluginsItemOrderKey()
{
Q_ASSERT(sender() == m_updatePluginsOrderTimer);
int index = 0;
for (auto item : m_itemList)
{
if (item->itemType() != DockItem::Plugins)
continue;
static_cast<PluginsItem *>(item)->setItemSortKey(++index);
}
}
void DockItemController::itemMove(DockItem * const moveItem, DockItem * const replaceItem)
{
Q_ASSERT(moveItem != replaceItem);
@ -50,7 +63,7 @@ void DockItemController::itemMove(DockItem * const moveItem, DockItem * const re
return;
const int moveIndex = m_itemList.indexOf(moveItem);
const int replaceIndex = replaceItem->itemType() == DockItem::Stretch ?
const int replaceIndex = replaceType == DockItem::Stretch ?
// disable insert after placeholder item
m_itemList.indexOf(replaceItem) - 1 :
m_itemList.indexOf(replaceItem);
@ -59,8 +72,12 @@ void DockItemController::itemMove(DockItem * const moveItem, DockItem * const re
m_itemList.insert(replaceIndex, moveItem);
emit itemMoved(moveItem, replaceIndex);
// update plugins sort key if order changed
if (moveType == DockItem::Plugins || replaceType == DockItem::Plugins)
m_updatePluginsOrderTimer->start();
// for app move, index 0 is launcher item, need to pass it.
if (moveItem->itemType() == DockItem::App && replaceItem->itemType() == DockItem::App)
if (moveType == DockItem::App && replaceType == DockItem::App)
m_appInter->MoveEntry(moveIndex - 1, replaceIndex - 1);
}
@ -87,6 +104,9 @@ void DockItemController::placeholderItemRemoved(PlaceholderItem *item)
DockItemController::DockItemController(QObject *parent)
: QObject(parent),
m_updatePluginsOrderTimer(new QTimer(this)),
m_appInter(new DBusDock(this)),
m_pluginsInter(new DockPluginsController(this)),
m_placeholderItem(new StretchItem),
@ -94,12 +114,17 @@ DockItemController::DockItemController(QObject *parent)
{
// m_placeholderItem->hide();
m_updatePluginsOrderTimer->setSingleShot(true);
m_updatePluginsOrderTimer->setInterval(1000);
m_itemList.append(new LauncherItem);
for (auto entry : m_appInter->entries())
m_itemList.append(new AppItem(entry));
m_itemList.append(m_placeholderItem);
m_itemList.append(m_containerItem);
connect(m_updatePluginsOrderTimer, &QTimer::timeout, this, &DockItemController::updatePluginsItemOrderKey);
connect(m_appInter, &DBusDock::EntryAdded, this, &DockItemController::appItemAdded);
connect(m_appInter, &DBusDock::EntryRemoved, this, static_cast<void (DockItemController::*)(const QString &)>(&DockItemController::appItemRemoved));
connect(m_appInter, &DBusDock::ServiceRestarted, this, &DockItemController::reloadAppItems);
@ -170,7 +195,7 @@ void DockItemController::pluginItemInserted(PluginsItem *item)
// find insert position
int insertIndex = 0;
const int itemSortKey = item->itemSortKey();
if (itemSortKey == -1)
if (itemSortKey == -1 || firstPluginPosition == -1)
{
insertIndex = m_itemList.size();
}
@ -180,8 +205,17 @@ void DockItemController::pluginItemInserted(PluginsItem *item)
}
else
{
// TODO: compare other plugins to find insert position
Q_ASSERT(false);
insertIndex = m_itemList.size();
for (int i(firstPluginPosition); i != m_itemList.size(); ++i)
{
PluginsItem *pItem = static_cast<PluginsItem *>(m_itemList[i]);
Q_ASSERT(pItem);
if (itemSortKey <= pItem->itemSortKey())
continue;
insertIndex = i;
break;
}
}
// qDebug() << insertIndex << item;

3
frame/controller/dockitemcontroller.h
View File

@ -29,6 +29,7 @@ signals:
void itemMoved(DockItem *item, const int index) const;
public slots:
void updatePluginsItemOrderKey();
void itemMove(DockItem * const moveItem, DockItem * const replaceItem);
void placeholderItemAdded(PlaceholderItem *item, DockItem *position);
void placeholderItemDocked(const QString &appDesktop, DockItem *position);
@ -46,6 +47,8 @@ private:
private:
QList<DockItem *> m_itemList;
QTimer *m_updatePluginsOrderTimer;
DBusDock *m_appInter;
DockPluginsController *m_pluginsInter;
StretchItem *m_placeholderItem;

5
frame/item/pluginsitem.cpp
View File

@ -45,6 +45,11 @@ int PluginsItem::itemSortKey() const
return m_pluginInter->itemSortKey(m_itemKey);
}
void PluginsItem::setItemSortKey(const int order) const
{
m_pluginInter->setSortKey(m_itemKey, order);
}
void PluginsItem::detachPluginWidget()
{
QWidget *widget = m_pluginInter->itemWidget(m_itemKey);

1
frame/item/pluginsitem.h
View File

@ -13,6 +13,7 @@ public:
~PluginsItem();
int itemSortKey() const;
void setItemSortKey(const int order) const;
void detachPluginWidget();
inline ItemType itemType() const {return Plugins;}