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

fix: 修复双屏切换成对角显示，副屏无法唤醒任务栏的问题

Browse Source 
鼠标监听区域未更新导致

Log:
Change-Id: Ifd86cb9d3369b9322fde8bd1af834b5f9e66537e
This commit is contained in:
Fan PengCheng 2021-04-13 19:01:41 +08:00
parent 6ea59ce9c4
commit 5da0c3d4a3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frame/util/multiscreenworker.cpp
View File

@ -773,6 +773,9 @@ void MultiScreenWorker::onRequestUpdatePosition(const Position &fromPos, const P
void MultiScreenWorker::onRequestUpdateMonitorInfo() void MultiScreenWorker::onRequestUpdateMonitorInfo()
{ {
// 只需要在屏幕信息变化的时候更新，其他时间不需要更新
onRequestUpdateRegionMonitor();
m_monitorUpdateTimer->start(); m_monitorUpdateTimer->start();
} }
@ -880,9 +883,9 @@ void MultiScreenWorker::initConnection()
// 更新所在屏幕 // 更新所在屏幕
resetDockScreen(); resetDockScreen();
// 通知后端 // 通知后端
emit requestUpdateFrontendGeometry(); onRequestUpdateFrontendGeometry();
// 通知窗管 // 通知窗管
emit requestNotifyWindowManager(); onRequestNotifyWindowManager();
}); });
} }

1
frame/window/mainwindow.cpp
View File

@ -344,6 +344,7 @@ void MainWindow::initConnections()
// -拖拽任务栏改变高度或宽度------------------------------------------------------------------------------- // -拖拽任务栏改变高度或宽度-------------------------------------------------------------------------------
connect(m_updateDragAreaTimer, &QTimer::timeout, this, &MainWindow::resetDragWindow); connect(m_updateDragAreaTimer, &QTimer::timeout, this, &MainWindow::resetDragWindow);
//TODO 后端考虑删除这块，目前还不能删除，调整任务栏高度的时候，任务栏外部区域有变化
connect(m_updateDragAreaTimer, &QTimer::timeout, m_multiScreenWorker, &MultiScreenWorker::onRequestUpdateRegionMonitor); connect(m_updateDragAreaTimer, &QTimer::timeout, m_multiScreenWorker, &MultiScreenWorker::onRequestUpdateRegionMonitor);
connect(m_dragWidget, &DragWidget::dragPointOffset, this, [ = ] { qApp->setProperty(DRAG_STATE_PROP, true); }); connect(m_dragWidget, &DragWidget::dragPointOffset, this, [ = ] { qApp->setProperty(DRAG_STATE_PROP, true); });