paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-06 00:57:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Qt,Qt5: fixed painting of TCustomPanel border, fixed painting of TCustomPanel background. issue #36590

Browse Source 
git-svn-id: trunk@62582 -
This commit is contained in:
zeljko 2020-01-24 08:51:17 +00:00
parent 8bcb4c3d6f
commit 1d3bd3cc4a
2 changed files with 58 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lcl/interfaces/qt/qtwidgets.pas
View File

@ -205,7 +205,7 @@ type
function SlotMouseMove(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
function SlotMouseWheel(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
procedure SlotMove(Event: QEventH); cdecl;
procedure SlotPaintBg(Sender: QObjectH; Event: QEventH); cdecl;
procedure SlotPaintBg(Sender: QObjectH; Event: QEventH); cdecl; virtual;
procedure SlotPaint(Sender: QObjectH; Event: QEventH); cdecl;
procedure SlotResize(Event: QEventH); cdecl;
function SlotContextMenu(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
@ -408,6 +408,7 @@ type
function CreateWidget(const AParams: TCreateParams):QWidgetH; override;
public
function CanPaintBackground: Boolean; override;
procedure SlotPaintBg(Sender: QObjectH; Event: QEventH); cdecl; override;
procedure setFocusPolicy(const APolicy: QtFocusPolicy); override;
procedure setFrameStyle(p1: Integer);
procedure setFrameShape(p1: QFrameShape);
@ -8837,11 +8838,34 @@ end;
function TQtFrame.CanPaintBackground: Boolean;
begin
Result := CanSendLCLMessage and getEnabled and
(LCLObject.Color <> clBackground);
if Result and (LCLObject is TCustomPanel) then
(LCLObject.Color <> clBackground) and (LCLObject.Color <> clDefault);
end;
procedure TQtFrame.SlotPaintBg(Sender: QObjectH; Event: QEventH); cdecl;
var
Painter: QPainterH;
Brush: QBrushH;
Color: TQColor;
R: TRect;
begin
if CanSendLCLMessage and (LCLObject is TWinControl) then
begin
Result := (TCustomPanel(LCLObject).BevelInner = bvNone) and
(TCustomPanel(LCLObject).BevelOuter = bvNone);
if LCLObject.Color = clDefault then
Color := Palette.DefaultColor
else
ColorRefToTQColor(ColorToRGB(LCLObject.Color), Color);
Painter := QPainter_create(QWidget_to_QPaintDevice(QWidgetH(Sender)));
Brush := QBrush_create(@Color, QtSolidPattern);
try
QPaintEvent_rect(QPaintEventH(Event), @R);
QPainter_fillRect(Painter, @R, Brush);
if (LCLObject is TCustomPanel) and (TCustomPanel(LCLObject).BorderStyle <> bsNone) then
q_DrawShadePanel(Painter, PRect(@R), Palette.Handle, True, 2);
QPainter_end(Painter);
finally
QBrush_destroy(Brush);
QPainter_destroy(Painter);
end;
end;
end;

34
lcl/interfaces/qt5/qtwidgets.pas
View File

@ -206,7 +206,7 @@ type
function SlotMouseMove(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
function SlotMouseWheel(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
procedure SlotMove(Event: QEventH); cdecl;
procedure SlotPaintBg(Sender: QObjectH; Event: QEventH); cdecl;
procedure SlotPaintBg(Sender: QObjectH; Event: QEventH); cdecl; virtual;
procedure SlotPaint(Sender: QObjectH; Event: QEventH); cdecl;
procedure SlotResize(Event: QEventH); cdecl;
function SlotContextMenu(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
@ -409,6 +409,7 @@ type
function CreateWidget(const AParams: TCreateParams):QWidgetH; override;
public
function CanPaintBackground: Boolean; override;
procedure SlotPaintBg(Sender: QObjectH; Event: QEventH); cdecl; override;
procedure setFocusPolicy(const APolicy: QtFocusPolicy); override;
procedure setFrameStyle(p1: Integer);
procedure setFrameShape(p1: QFrameShape);
@ -8764,11 +8765,34 @@ end;
function TQtFrame.CanPaintBackground: Boolean;
begin
Result := CanSendLCLMessage and getEnabled and
(LCLObject.Color <> clBackground);
if Result and (LCLObject is TCustomPanel) then
(LCLObject.Color <> clBackground) and (LCLObject.Color <> clDefault);
end;
procedure TQtFrame.SlotPaintBg(Sender: QObjectH; Event: QEventH); cdecl;
var
Painter: QPainterH;
Brush: QBrushH;
Color: TQColor;
R: TRect;
begin
if CanSendLCLMessage and (LCLObject is TWinControl) then
begin
Result := (TCustomPanel(LCLObject).BevelInner = bvNone) and
(TCustomPanel(LCLObject).BevelOuter = bvNone);
if LCLObject.Color = clDefault then
Color := Palette.DefaultColor
else
ColorRefToTQColor(ColorToRGB(LCLObject.Color), Color);
Painter := QPainter_create(QWidget_to_QPaintDevice(QWidgetH(Sender)));
Brush := QBrush_create(@Color, QtSolidPattern);
try
QPaintEvent_rect(QPaintEventH(Event), @R);
QPainter_fillRect(Painter, @R, Brush);
if (LCLObject is TCustomPanel) and (TCustomPanel(LCLObject).BorderStyle <> bsNone) then
q_DrawShadePanel(Painter, PRect(@R), Palette.Handle, True, 2);
QPainter_end(Painter);
finally
QBrush_destroy(Brush);
QPainter_destroy(Painter);
end;
end;
end;