From dadc0e93e2c965d477bb1f74afaeef35f27ff271 Mon Sep 17 00:00:00 2001
From: zeljan1 <zeljko@holobit.hr>
Date: Mon, 7 Apr 2025 21:14:11 +0200
Subject: [PATCH] Qt5,Qt6: fix GetWindowSize regression. issue #41575

---
 lcl/interfaces/qt5/qtwinapi.inc | 6 ++++++
 lcl/interfaces/qt6/qtwinapi.inc | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/lcl/interfaces/qt5/qtwinapi.inc b/lcl/interfaces/qt5/qtwinapi.inc
index ce4ee881cc..bfa90cc644 100644
--- a/lcl/interfaces/qt5/qtwinapi.inc
+++ b/lcl/interfaces/qt5/qtwinapi.inc
@@ -4476,6 +4476,12 @@ begin
     GetClientRect(Handle, ARect);
     Width := ARect.Width;
     Height := ARect.Height;
+    {$IFDEF QTSCROLLABLEFORMS}
+    if TQtMainWindow(Handle).ScrollArea.verticalScrollBar.getVisible then
+      inc(Height, TQtMainWindow(Handle).ScrollArea.verticalScrollBar.getWidth);
+    if TQtMainWindow(Handle).ScrollArea.horizontalScrollBar.getVisible then
+      inc(Width, TQtMainWindow(Handle).ScrollArea.horizontalScrollBar.getHeight);
+    {$ENDIF}
   end else
   begin
     ASize := TQtWidget(Handle).getSize;
diff --git a/lcl/interfaces/qt6/qtwinapi.inc b/lcl/interfaces/qt6/qtwinapi.inc
index b98e55c80c..8e371f0a4d 100644
--- a/lcl/interfaces/qt6/qtwinapi.inc
+++ b/lcl/interfaces/qt6/qtwinapi.inc
@@ -4504,6 +4504,12 @@ begin
     GetClientRect(Handle, ARect);
     Width := ARect.Width;
     Height := ARect.Height;
+    {$IFDEF QTSCROLLABLEFORMS}
+    if TQtMainWindow(Handle).ScrollArea.verticalScrollBar.getVisible then
+      inc(Height, TQtMainWindow(Handle).ScrollArea.verticalScrollBar.getWidth);
+    if TQtMainWindow(Handle).ScrollArea.horizontalScrollBar.getVisible then
+      inc(Width, TQtMainWindow(Handle).ScrollArea.horizontalScrollBar.getHeight);
+    {$ENDIF}
   end else
   begin
     ASize := TQtWidget(Handle).getSize;