From 04b39226b655b9dc9aec153a907d7c86e7d71d96 Mon Sep 17 00:00:00 2001 From: zeljko Date: Mon, 9 Dec 2019 16:23:47 +0000 Subject: [PATCH] Qt,Qt5: fixed FrameRect() drawing. issue #36411 git-svn-id: trunk@62363 - --- lcl/interfaces/qt/qtobjects.pas | 2 ++ lcl/interfaces/qt5/qtobjects.pas | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lcl/interfaces/qt/qtobjects.pas b/lcl/interfaces/qt/qtobjects.pas index 9931f7210e..01b1403f5d 100644 --- a/lcl/interfaces/qt/qtobjects.pas +++ b/lcl/interfaces/qt/qtobjects.pas @@ -2472,8 +2472,10 @@ begin if AColor = nil then AColor := BackgroundBrush.getColor; // stop asserts from qtlib + {issue #36411. Seem that assert triggered in Qt4 < 4.7 only. if (w < x) or (h < y) then exit; + } q_DrawPlainRect(Widget, x, y, w, h, AColor, lineWidth, FillBrush); end; diff --git a/lcl/interfaces/qt5/qtobjects.pas b/lcl/interfaces/qt5/qtobjects.pas index 8d50113c37..8e52e22b04 100644 --- a/lcl/interfaces/qt5/qtobjects.pas +++ b/lcl/interfaces/qt5/qtobjects.pas @@ -2480,8 +2480,10 @@ begin if AColor = nil then AColor := BackgroundBrush.getColor; // stop asserts from qtlib + {issue #36411. Seem that assert triggered in Qt4 < 4.7 only. if (w < x) or (h < y) then exit; + } q_DrawPlainRect(Widget, x, y, w, h, AColor, lineWidth, FillBrush); end;