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

feat(mainpanelcontrol):change position type

Browse Source
This commit is contained in:
shaojun 2019-09-03 10:22:27 +08:00
parent 4dbaf87af6
commit d152add518
3 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frame/panel/mainpanelcontrol.cpp
View File

@ -127,8 +127,6 @@ void MainPanelControl::updateMainPanelLayout()
m_trayAreaLayout->setDirection(QBoxLayout::TopToBottom); m_trayAreaLayout->setDirection(QBoxLayout::TopToBottom);
m_appAreaSonLayout->setDirection(QBoxLayout::TopToBottom); m_appAreaSonLayout->setDirection(QBoxLayout::TopToBottom);
break; break;
default:
break;
} }
QTimer::singleShot(0, this, &MainPanelControl::updateAppAreaSonWidgetSize); QTimer::singleShot(0, this, &MainPanelControl::updateAppAreaSonWidgetSize);
@ -222,7 +220,7 @@ void MainPanelControl::updateAppAreaSonWidgetSize()
QTimer::singleShot(10, this, &MainPanelControl::updateDisplayMode); QTimer::singleShot(10, this, &MainPanelControl::updateDisplayMode);
} }
void MainPanelControl::setPositonValue(Position position) void MainPanelControl::setPositonValue(Dock::Position position)
{ {
if (m_position == position) if (m_position == position)
return; return;
@ -336,6 +334,7 @@ void MainPanelControl::dragEnterEvent(QDragEnterEvent *e)
void MainPanelControl::dragLeaveEvent(QDragLeaveEvent *e) void MainPanelControl::dragLeaveEvent(QDragLeaveEvent *e)
{ {
Q_UNUSED(e);
if (m_placeholderItem) { if (m_placeholderItem) {
const QRect r(static_cast<QWidget *>(parent())->pos(), size()); const QRect r(static_cast<QWidget *>(parent())->pos(), size());
const QPoint p(QCursor::pos()); const QPoint p(QCursor::pos());
@ -375,7 +374,7 @@ void MainPanelControl::handleDragMove(QDragMoveEvent *e, bool isFilter)
m_placeholderItem = new PlaceholderItem; m_placeholderItem = new PlaceholderItem;
if (m_position == Qt::TopEdge || m_position == Qt::BottomEdge) { if (m_position == Dock::Top || m_position == Dock::Bottom) {
if (m_appAreaSonWidget->mapFromParent(e->pos()).x() > m_appAreaSonWidget->rect().right()) { if (m_appAreaSonWidget->mapFromParent(e->pos()).x() > m_appAreaSonWidget->rect().right()) {
// 插入到最右侧 // 插入到最右侧
insertPositionItem = nullptr; insertPositionItem = nullptr;
@ -493,16 +492,8 @@ void MainPanelControl::startDrag(DockItem *item)
m_appDragWidget->show(); m_appDragWidget->show();
Dock::Position position;
switch (m_position) {
case Position::Top: position = Dock::Top; break;
case Position::Bottom: position = Dock::Bottom; break;
case Position::Left: position = Dock::Left; break;
case Position::Right: position = Dock::Right; break;
}
appDrag->appDragWidget()->setOriginPos((m_appAreaSonWidget->mapToGlobal(item->pos()))); appDrag->appDragWidget()->setOriginPos((m_appAreaSonWidget->mapToGlobal(item->pos())));
appDrag->appDragWidget()->setDockInfo(position, QRect(mapToGlobal(pos()), size())); appDrag->appDragWidget()->setDockInfo(m_position, QRect(mapToGlobal(pos()), size()));
static_cast<QGraphicsView *>(m_appDragWidget)->viewport()->installEventFilter(this); static_cast<QGraphicsView *>(m_appDragWidget)->viewport()->installEventFilter(this);
drag = appDrag; drag = appDrag;
@ -569,7 +560,7 @@ DockItem *MainPanelControl::dropTargetItem(DockItem *sourceItem, QPoint point)
DockItem *first = qobject_cast<DockItem *>(m_appAreaSonLayout->itemAt(0)->widget()); DockItem *first = qobject_cast<DockItem *>(m_appAreaSonLayout->itemAt(0)->widget());
DockItem *last = qobject_cast<DockItem *>(m_appAreaSonLayout->itemAt(m_appAreaSonLayout->count() - 1)->widget()); DockItem *last = qobject_cast<DockItem *>(m_appAreaSonLayout->itemAt(m_appAreaSonLayout->count() - 1)->widget());
if (m_position == Qt::TopEdge || m_position == Qt::BottomEdge) { if (m_position == Dock::Top || m_position == Dock::Bottom) {
if (point.x() < 0) { if (point.x() < 0) {
targetItem = first; targetItem = first;

2
frame/panel/mainpanelcontrol.h
View File

@ -75,7 +75,7 @@ private:
void dragMoveEvent(QDragMoveEvent *e) override; void dragMoveEvent(QDragMoveEvent *e) override;
void dragEnterEvent(QDragEnterEvent *e) override; void dragEnterEvent(QDragEnterEvent *e) override;
void dragLeaveEvent(QDragLeaveEvent *e); void dragLeaveEvent(QDragLeaveEvent *e) override;
void dropEvent(QDropEvent *) override; void dropEvent(QDropEvent *) override;
bool eventFilter(QObject *watched, QEvent *event) override; bool eventFilter(QObject *watched, QEvent *event) override;

10
frame/window/mainwindow.cpp
View File

@ -506,15 +506,7 @@ void MainWindow::updateGeometry()
// DockDisplayMode and DockPosition MUST be set before invoke setFixedSize method of MainPanel // DockDisplayMode and DockPosition MUST be set before invoke setFixedSize method of MainPanel
// m_mainPanel->updateDockDisplayMode(m_settings->displayMode()); // m_mainPanel->updateDockDisplayMode(m_settings->displayMode());
m_mainPanel->setPositonValue(position);
Position panelPos;
switch (position) {
case Dock::Top: panelPos = Position::Top; break;
case Dock::Bottom: panelPos = Position::Bottom; break;
case Dock::Left: panelPos = Position::Left; break;
case Dock::Right: panelPos = Position::Right; break;
}
m_mainPanel->setPositonValue(panelPos);
// this->setFixedSize has been overridden for size animation // this->setFixedSize has been overridden for size animation
resizeMainPanelWindow(); resizeMainPanelWindow();