From a51554b579e16b6351e17eb965e5b62eb3662276 Mon Sep 17 00:00:00 2001 From: Fan PengCheng Date: Thu, 22 Apr 2021 17:10:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=AB=98=E5=88=86?= =?UTF-8?q?=E5=B1=8F=E5=8F=8C=E5=B1=8F=E6=89=A9=E5=B1=95=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E6=99=BA=E8=83=BD=E9=9A=90=E8=97=8F=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=8F=E5=88=87=E6=8D=A2=E5=B1=8F=E5=B9=95?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 代码问题，之前修复高分屏下任务栏反复弹出问题引入，切换任务栏到另外一个屏幕时，条件写错了，导致提前终止流程。 Log: 修复任务栏在副屏唤起失败的问题 Bug: https://pms.uniontech.com/zentao/bug-view-75696.html Change-Id: Id4cf066b61c1b7a47e77217392638ee5ced5f01e --- frame/util/multiscreenworker.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frame/util/multiscreenworker.cpp b/frame/util/multiscreenworker.cpp index 3764127a9..b93cb08f6 100644 --- a/frame/util/multiscreenworker.cpp +++ b/frame/util/multiscreenworker.cpp @@ -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; }