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 
仅显示在主屏时,设置监听区域的时候，如果判断副屏是否可显示任务栏，不符合会直接return，导致其他屏幕监听对应区域的代码未执行，改成continue就好了

Log: 修复任务栏一直隐藏模式可能无法显示的问题
Change-Id: I1e2b3c8777d7ee279a6d5462409ee97a7af03441
This commit is contained in:
Fan PengCheng 2021-04-19 09:47:34 +08:00 committed by fanpengcheng
parent 81fd4a245a
commit 49edbcdcef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frame/util/multiscreenworker.cpp
View File

@ -516,7 +516,7 @@ void MultiScreenWorker::onRequestUpdateRegionMonitor()
for (auto s : DIS_INS->screens()) { for (auto s : DIS_INS->screens()) {
// 屏幕此位置不可停靠时,不用监听这块区域 // 屏幕此位置不可停靠时,不用监听这块区域
if (!DIS_INS->canDock(s, m_position)) if (!DIS_INS->canDock(s, m_position))
return; continue;
MonitRect monitorRect; MonitRect monitorRect;
QRect screenRect = s->geometry(); QRect screenRect = s->geometry();
@ -565,7 +565,7 @@ void MultiScreenWorker::onRequestUpdateRegionMonitor()
for (auto s : DIS_INS->screens()) { for (auto s : DIS_INS->screens()) {
// 屏幕此位置不可停靠时,不用监听这块区域 // 屏幕此位置不可停靠时,不用监听这块区域
if (!DIS_INS->canDock(s, m_position)) if (!DIS_INS->canDock(s, m_position))
return; continue;
MonitRect monitorRect; MonitRect monitorRect;
QRect screenRect = s->geometry(); QRect screenRect = s->geometry();
@ -618,7 +618,7 @@ void MultiScreenWorker::onRequestUpdateRegionMonitor()
for (auto s : DIS_INS->screens()) { for (auto s : DIS_INS->screens()) {
// 屏幕此位置不可停靠时,不用监听这块区域 // 屏幕此位置不可停靠时,不用监听这块区域
if (!DIS_INS->canDock(s, m_position)) if (!DIS_INS->canDock(s, m_position))
return; continue;
MonitRect monitorRect; MonitRect monitorRect;
QRect screenRect = s->geometry(); QRect screenRect = s->geometry();
@ -1568,7 +1568,7 @@ void MultiScreenWorker::tryToShowDock(int eventX, int eventY)
// 任务栏显示状态，但需要切换屏幕 // 任务栏显示状态，但需要切换屏幕
if (toScreen != m_ds.current()) { if (toScreen != m_ds.current()) {
if (!m_delayWakeTimer->isActive()) { if (!m_delayWakeTimer->isActive()) {
m_delayScreen = toScreen; m_delayScreen = toScreen;
m_delayWakeTimer->start(Utils::SettingValue("com.deepin.dde.dock.mainwindow", "/com/deepin/dde/dock/mainwindow/", MonitorsSwitchTime, 2000).toInt()); m_delayWakeTimer->start(Utils::SettingValue("com.deepin.dde.dock.mainwindow", "/com/deepin/dde/dock/mainwindow/", MonitorsSwitchTime, 2000).toInt());
} }
} else { } else {