From 9b86bb2140c1e1580c5eef612106ac532b9900b7 Mon Sep 17 00:00:00 2001
From: duanshengchao <519970194@qq.com>
Date: Tue, 19 Nov 2024 17:22:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DdataPanel=E5=A4=A7=E5=B0=8F?=
=?UTF-8?q?=E8=B6=85=E5=87=BAdashboard=E6=97=B6=E8=BF=9B=E8=A1=8C=E7=A7=BB?=
=?UTF-8?q?=E5=8A=A8=E5=90=8E=EF=BC=8C=E8=87=AA=E5=8A=A8=E4=BB=A5=E5=8F=B3?=
=?UTF-8?q?=E4=B8=8B=E4=BE=A7=E5=AF=B9=E9=BD=90=E9=80=A0=E6=88=90=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E6=93=8D=E4=BD=9C=E5=8A=9F=E8=83=BD=E6=A0=8F=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
source/customBorderContainer.cpp | 6 ++++++
ui/dashboardFrame.ui | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/source/customBorderContainer.cpp b/source/customBorderContainer.cpp
index 4233c85..62aff79 100644
--- a/source/customBorderContainer.cpp
+++ b/source/customBorderContainer.cpp
@@ -447,6 +447,12 @@ void CustomBorderContainer::autoAdjustGeometry(const QString& strOperation)
nMoveX = nMoveX - (m_pWidget->geometry().right() - parentWiget->width());
if(m_pWidget->geometry().bottom() > parentWiget->height())
nMoveY = nMoveY - (m_pWidget->geometry().bottom() - parentWiget->height());
+
+ //左上边界不能出界(自身大小大于父组件移动时会出现),不然无法移动(移动热点在上方)
+ if(nMoveX < 0)
+ nMoveX = 0;
+ if(nMoveY < 0)
+ nMoveY = 0;
}
else
{
diff --git a/ui/dashboardFrame.ui b/ui/dashboardFrame.ui
index 5e212a5..851a889 100644
--- a/ui/dashboardFrame.ui
+++ b/ui/dashboardFrame.ui
@@ -6,8 +6,8 @@
0
0
- 1448
- 867
+ 1256
+ 773