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

feal(mainpanel): add moveitem function and add a new function variable

Browse Source
This commit is contained in:
wangxuwen 2019-08-19 15:17:56 +08:00
parent 01500100b9
commit e6bcc1e45a
3 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
frame/panel/mainpanelcontrol.cpp
View File

@ -114,24 +114,24 @@ void MainPanelControl::updateMainPanelLayout()
QTimer::singleShot(0, this, &MainPanelControl::updateAppAreaSonWidgetSize);
}
void MainPanelControl::addFixedAreaItem(QWidget *wdg)
void MainPanelControl::addFixedAreaItem(const int index, QWidget *wdg)
{
m_fixedAreaLayout->addWidget(wdg, 0, Qt::AlignCenter);
m_fixedAreaLayout->insertWidget(index, wdg, 0, Qt::AlignCenter);
}
void MainPanelControl::addAppAreaItem(QWidget *wdg)
void MainPanelControl::addAppAreaItem(const int index, QWidget *wdg)
{
m_appAreaSonLayout->addWidget(wdg, 0, Qt::AlignCenter);
m_appAreaSonLayout->insertWidget(index, wdg, 0, Qt::AlignCenter);
}
void MainPanelControl::addTrayAreaItem(QWidget *wdg)
void MainPanelControl::addTrayAreaItem(const int index, QWidget *wdg)
{
m_trayAreaLayout->addWidget(wdg, 0, Qt::AlignCenter);
m_trayAreaLayout->insertWidget(index, wdg, 0, Qt::AlignCenter);
}
void MainPanelControl::addPluginAreaItem(QWidget *wdg)
void MainPanelControl::addPluginAreaItem(const int index, QWidget *wdg)
{
m_pluginLayout->addWidget(wdg, 0, Qt::AlignCenter);
m_pluginLayout->insertWidget(index, wdg, 0, Qt::AlignCenter);
}
void MainPanelControl::removeFixedAreaItem(QWidget *wdg)
@ -179,20 +179,20 @@ void MainPanelControl::setPositonValue(const Qt::Edge val)
m_position = val;
}
void MainPanelControl::itemInserted(const int index, DockItem *item)
void MainPanelControl::insertItem(const int index, DockItem *item)
{
switch (item->itemType()) {
case DockItem::Launcher:
addFixedAreaItem(item);
addFixedAreaItem(index, item);
break;
case DockItem::App:
addAppAreaItem(item);
addAppAreaItem(index, item);
break;
case DockItem::TrayPlugin:
addTrayAreaItem(item);
addTrayAreaItem(index, item);
break;
case DockItem::Plugins:
addPluginAreaItem(item);
addPluginAreaItem(index, item);
break;
default:
break;
@ -201,7 +201,7 @@ void MainPanelControl::itemInserted(const int index, DockItem *item)
updateAppAreaSonWidgetSize();
}
void MainPanelControl::itemRemoved(DockItem *item)
void MainPanelControl::removeItem(DockItem *item)
{
switch (item->itemType()) {
case DockItem::Launcher:
@ -223,3 +223,11 @@ void MainPanelControl::itemRemoved(DockItem *item)
updateAppAreaSonWidgetSize();
}
void MainPanelControl::movedItem(const int index, DockItem *item)
{
// remove old item
removeItem(item);
// insert new position
insertItem(index, item);
}

13
frame/panel/mainpanelcontrol.h
View File

@ -33,10 +33,10 @@ public:
MainPanelControl(QWidget *parent = 0);
~MainPanelControl();
void addFixedAreaItem(QWidget *wdg);
void addAppAreaItem(QWidget *wdg);
void addTrayAreaItem(QWidget *wdg);
void addPluginAreaItem(QWidget *wdg);
void addFixedAreaItem(const int index, QWidget *wdg);
void addAppAreaItem(const int index, QWidget *wdg);
void addTrayAreaItem(const int index, QWidget *wdg);
void addPluginAreaItem(const int index, QWidget *wdg);
void removeFixedAreaItem(QWidget *wdg);
void removeAppAreaItem(QWidget *wdg);
void removeTrayAreaItem(QWidget *wdg);
@ -51,8 +51,9 @@ private:
void updateMainPanelLayout();
public slots:
void itemInserted(const int index, DockItem *item);
void itemRemoved(DockItem *item);
void insertItem(const int index, DockItem *item);
void removeItem(DockItem *item);
void movedItem(const int index, DockItem *item);
private:
QBoxLayout *m_mainPanelLayout;

6
frame/window/mainwindow.cpp
View File

@ -110,7 +110,7 @@ MainWindow::MainWindow(QWidget *parent)
m_mainPanel->setFixedSize(m_settings->panelSize());
for (auto item : DockItemManager::instance()->itemList())
m_mainPanel->itemInserted(-1, item);
m_mainPanel->insertItem(-1, item);
}
MainWindow::~MainWindow()
@ -403,8 +403,8 @@ void MainWindow::initConnections()
connect(m_dbusDaemonInterface, &QDBusConnectionInterface::serviceOwnerChanged, this, &MainWindow::onDbusNameOwnerChanged);
connect(DockItemManager::instance(), &DockItemManager::itemInserted, m_mainPanel, &MainPanelControl::itemInserted, Qt::DirectConnection);
connect(DockItemManager::instance(), &DockItemManager::itemRemoved, m_mainPanel, &MainPanelControl::itemRemoved, Qt::DirectConnection);
connect(DockItemManager::instance(), &DockItemManager::itemInserted, m_mainPanel, &MainPanelControl::insertItem, Qt::DirectConnection);
connect(DockItemManager::instance(), &DockItemManager::itemRemoved, m_mainPanel, &MainPanelControl::removeItem, Qt::DirectConnection);
}
const QPoint MainWindow::x11GetWindowPos()