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

Merge branch 'zhaolong/uos_bug27070' into 'uos'

Browse Source 
fix(frame): 对齐拼接屏衔接处不可放置任务栏

See merge request dde-v20/dde-dock!578
This commit is contained in:
范朋程 2020-06-11 18:43:55 +08:00
commit 5d362d1dc9
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frame/util/docksettings.cpp
View File

@ -507,9 +507,8 @@ void DockSettings::updateFrontendGeometry()
resetFrontendGeometry();
}
void DockSettings::setDockScreen(const QString &scrName)
bool DockSettings::setDockScreen(const QString &scrName)
{
m_isMouseMoveCause = true;
QList<Monitor*> monitors = m_monitors.keys();
for (Monitor *monitor : monitors) {
if (monitor && monitor->name() == scrName) {
@ -517,6 +516,25 @@ void DockSettings::setDockScreen(const QString &scrName)
break;
}
}
bool canBeDock = false;
switch (m_position) {
case Top:
canBeDock = m_mouseCauseDockScreen->dockPosition().topDock;
break;
case Right:
canBeDock = m_mouseCauseDockScreen->dockPosition().rightDock;
break;
case Bottom:
canBeDock = m_mouseCauseDockScreen->dockPosition().bottomDock;
break;
case Left:
canBeDock = m_mouseCauseDockScreen->dockPosition().leftDock;
break;
}
m_isMouseMoveCause = canBeDock;
return canBeDock;
}
void DockSettings::onOpacityChanged(const double value)

2
frame/util/docksettings.h
View File

@ -73,7 +73,7 @@ public:
void showDockSettingsMenu();
void updateFrontendGeometry();
void setDockScreen(const QString &scrName);
bool setDockScreen(const QString &scrName);
QString &currentDockScreen() { return m_currentScreen; }
QSize m_mainWindowSize;

4
frame/window/mainwindow.cpp
View File

@ -1049,8 +1049,8 @@ void MainWindow::onRegionMonitorChanged(int x, int y, const QString &key)
} else {
// 移动Dock至相应屏相应位置
m_mouseCauseDock = true;
m_settings->setDockScreen(screen->name());
positionChanged(m_curDockPos, m_curDockPos);
if (m_settings->setDockScreen(screen->name()))
positionChanged(m_curDockPos, m_curDockPos);
}
}