From 399a8d762059dd951c0a79fad0da6b224dda8125 Mon Sep 17 00:00:00 2001 From: donghualin Date: Wed, 29 Jun 2022 17:31:04 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=8F=E5=9C=A8=E9=AB=98=E7=BC=A9=E6=94=BE=E7=8E=87=E4=B8=8B?= =?UTF-8?q?=E9=98=B2=E5=91=86=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调用当前类内部的接口来获取当前任务栏所在屏幕的尺寸，来设置区域值，这样保证设置的值是正确的 Log: 修复任务栏在高缩放率下防呆位置错误 Influence: 高缩放率下，查看防呆区域 Change-Id: I1a54b23649c22d8e77ea184ecc03a5917fd1a837 --- frame/util/multiscreenworker.cpp | 35 ++++++++++++++------------------ 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/frame/util/multiscreenworker.cpp b/frame/util/multiscreenworker.cpp index 2884d5c1d..c76540799 100644 --- a/frame/util/multiscreenworker.cpp +++ b/frame/util/multiscreenworker.cpp @@ -766,11 +766,6 @@ void MultiScreenWorker::onRequestNotifyWindowManager() qDebug() << "dock real geometry:" << dockGeometry; qDebug() << "screen width:" << DIS_INS->screenRawWidth() << ", height:" << DIS_INS->screenRawHeight(); - QScreen *curentScreen = DIS_INS->screen(m_ds.current()); - // 在把显示器都拔掉后，此时获取到的当前屏幕为空，无需继续处理 - if (!curentScreen) - return; - const qreal &ratio = qApp->devicePixelRatio(); if (Utils::IS_WAYLAND_DISPLAY) { QList varList = {0, 0, 0, 0}; @@ -778,26 +773,26 @@ void MultiScreenWorker::onRequestNotifyWindowManager() case Position::Top: varList[0] = 1; varList[1] = dockGeometry.y() + dockGeometry.height() + WINDOWMARGIN * ratio; - varList[2] = curentScreen->geometry().x(); - varList[3] = curentScreen->geometry().x() + curentScreen->size().width(); + varList[2] = dockGeometry.x(); + varList[3] = dockGeometry.x() + dockGeometry.width(); break; case Position::Bottom: varList[0] = 3; varList[1] = DIS_INS->screenRawHeight() - dockGeometry.y() + WINDOWMARGIN * ratio; - varList[2] = curentScreen->geometry().x(); - varList[3] = curentScreen->geometry().x() + curentScreen->size().width(); + varList[2] = dockGeometry.x(); + varList[3] = dockGeometry.x() + dockGeometry.width(); break; case Position::Left: varList[0] = 0; varList[1] = dockGeometry.x() + dockGeometry.width() + WINDOWMARGIN * ratio; - varList[2] = curentScreen->geometry().y(); - varList[3] = curentScreen->geometry().y() + curentScreen->size().height(); + varList[2] = dockGeometry.y(); + varList[3] = dockGeometry.y() + dockGeometry.height(); break; case Position::Right: varList[0] = 2; varList[1] = DIS_INS->screenRawWidth() - dockGeometry.x() + WINDOWMARGIN * ratio; varList[2] = dockGeometry.y(); - varList[3] = curentScreen->geometry().y() + curentScreen->size().height(); + varList[3] = dockGeometry.y() + dockGeometry.height(); break; } @@ -814,26 +809,26 @@ void MultiScreenWorker::onRequestNotifyWindowManager() case Position::Top: orientation = XcbMisc::OrientationTop; strut = dockGeometry.y() + dockGeometry.height(); - strutStart = curentScreen->geometry().x(); - strutEnd = curentScreen->geometry().x() + curentScreen->size().width(); + strutStart = dockGeometry.x(); + strutEnd = dockGeometry.x() + dockGeometry.width(); break; case Position::Bottom: orientation = XcbMisc::OrientationBottom; strut = DIS_INS->screenRawHeight() - dockGeometry.y(); - strutStart = curentScreen->geometry().x(); - strutEnd = curentScreen->geometry().x() + curentScreen->size().width(); + strutStart = dockGeometry.x(); + strutEnd = dockGeometry.x() + dockGeometry.width(); break; case Position::Left: orientation = XcbMisc::OrientationLeft; strut = dockGeometry.x() + dockGeometry.width(); - strutStart = curentScreen->geometry().y(); - strutEnd = curentScreen->geometry().y() + curentScreen->size().height(); + strutStart = dockGeometry.y(); + strutEnd = dockGeometry.y() + dockGeometry.height(); break; case Position::Right: orientation = XcbMisc::OrientationRight; strut = DIS_INS->screenRawWidth() - dockGeometry.x(); - strutStart = curentScreen->geometry().y(); - strutEnd = curentScreen->geometry().y() + curentScreen->size().height(); + strutStart = dockGeometry.y(); + strutEnd = dockGeometry.y() + dockGeometry.height(); break; }