Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-02 15:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复高分屏双屏扩展模式下智能隐藏模式任务栏切换屏幕显示失效问题

Browse Source 
代码问题，之前修复高分屏下任务栏反复弹出问题引入，切换任务栏到另外一个屏幕时，条件写错了，导致提前终止流程。

Log: 修复任务栏在副屏唤起失败的问题
Bug: https://pms.uniontech.com/zentao/bug-view-75696.html
Change-Id: Id4cf066b61c1b7a47e77217392638ee5ced5f01e
This commit is contained in:
Fan PengCheng 2021-04-22 17:10:02 +08:00 committed by fanpengcheng
parent ed5ae88ae2
commit a51554b579
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

@ -988,14 +988,14 @@ void MultiScreenWorker::displayAnimation(const QString &screen, const Position &
switch (act) {
case AniAction::Show:
if (pos == Position::Top || pos == Position::Bottom) {
if (dockShowRect.height() > mainwindowRect.height() - 2
&& dockShowRect.height() < mainwindowRect.height() + 2) {
if (qAbs(dockShowRect.height() - mainwindowRect.height()) <= 1
&& mainwindowRect.contains(dockShowRect.center())) {
emit requestNotifyWindowManager();
return;
}
} else if (pos == Position::Left || pos == Position::Right) {
if (dockShowRect.width() > mainwindowRect.width() - 2
&& dockShowRect.width() < mainwindowRect.width() + 2) {
if (qAbs(dockShowRect.width() - mainwindowRect.width()) <= 1
&& mainwindowRect.contains(dockShowRect.center())) {
emit requestNotifyWindowManager();
return;
}