paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 19:39:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt5,Qt6: fixed design time drawing of non visible controls over QAbstractItemView and QTextEdit classes. issue #41510

Browse Source
This commit is contained in:
zeljan1 2025-03-07 22:41:01 +01:00
parent d3392b3eb9
commit adf11362e1
2 changed files with 138 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10477,6 +10477,8 @@ begin
// initialize scrollbars // initialize scrollbars
verticalScrollBar; verticalScrollBar;
horizontalScrollBar; horizontalScrollBar;
if csDesigning in LCLObject.ComponentState then
QWidget_setAutoFillBackground(viewportWidget, False);
end; end;
procedure TQtTextEdit.DetachEvents; procedure TQtTextEdit.DetachEvents;
@ -10502,6 +10504,9 @@ begin
end; end;
function TQtTextEdit.viewportEventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; function TQtTextEdit.viewportEventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
var
DC: TQtDeviceContext;
R: TRect;
begin begin
Result := False; Result := False;
QEvent_accept(Event); QEvent_accept(Event);
@ -10511,6 +10516,23 @@ begin
QEventMouseButtonRelease, QEventMouseButtonRelease,
QEventMouseButtonDblClick: Result := SlotMouse(Sender, Event); QEventMouseButtonDblClick: Result := SlotMouse(Sender, Event);
QEventMouseMove: Result := SlotMouseMove(Sender, Event); QEventMouseMove: Result := SlotMouseMove(Sender, Event);
QEventPaint:
begin
if csDesigning in LCLObject.ComponentState then
begin
if LCLObject.Color = clDefault then
begin
QPaintEvent_rect(QPaintEventH(Event), @R);
DC := TQtDeviceContext.Create(QWidgetH(Sender), True);
try
LCLIntf.SetBkColor(HDC(DC), ColorToRgb(clWindow));
DC.fillRect(R.Left, R.Top, R.Width, R.Height);
finally
DC.Free;
end;
end;
end;
end;
end; end;
end; end;
@ -12987,6 +13009,9 @@ begin
QListWidget_hook_hook_itemSelectionChanged(FSelectionChangeHook, @signalSelectionChanged); QListWidget_hook_hook_itemSelectionChanged(FSelectionChangeHook, @signalSelectionChanged);
QListWidget_hook_hook_itemClicked(FItemClickedHook, @signalItemClicked); QListWidget_hook_hook_itemClicked(FItemClickedHook, @signalItemClicked);
QListWidget_hook_hook_currentTextChanged(FItemTextChangedHook, @signalItemTextChanged); QListWidget_hook_hook_currentTextChanged(FItemTextChangedHook, @signalItemTextChanged);
if csDesigning in LCLObject.ComponentState then
QWidget_setAutoFillBackground(viewportWidget, False);
end; end;
procedure TQtListWidget.DetachEvents; procedure TQtListWidget.DetachEvents;
@ -13211,6 +13236,16 @@ begin
OwnerDataNeeded(R); OwnerDataNeeded(R);
DC := TQtDeviceContext.Create(QWidgetH(Sender), True); DC := TQtDeviceContext.Create(QWidgetH(Sender), True);
try try
if csDesigning in LCLObject.ComponentState then
begin
if LCLObject.Color = clDefault then
begin
DC.save;
LCLIntf.SetBkColor(HDC(DC), ColorToRgb(clWindow));
DC.fillRect(R.Left, R.Top, R.Width, R.Height);
DC.restore;
end;
end;
TCustomListViewAccess(LCLObject).Canvas.handle := HDC(DC); TCustomListViewAccess(LCLObject).Canvas.handle := HDC(DC);
TCustomListViewAccess(LCLObject).IntfCustomDraw(dtControl, cdPrePaint, 0, 0, [], @R); TCustomListViewAccess(LCLObject).IntfCustomDraw(dtControl, cdPrePaint, 0, 0, [], @R);
finally finally
@ -13414,6 +13449,7 @@ begin
end; end;
end else end else
case QEvent_type(Event) of case QEvent_type(Event) of
QEventPaint: Result := inherited itemViewViewportEventFilter(Sender, Event);
QEventMouseButtonPress, QEventMouseButtonPress,
QEventMouseButtonRelease, QEventMouseButtonRelease,
QEventMouseButtonDblClick: QEventMouseButtonDblClick:
@ -14242,6 +14278,7 @@ begin
if (LCLObject <> nil) then if (LCLObject <> nil) then
begin begin
case QEvent_type(Event) of case QEvent_type(Event) of
QEventPaint: Result := inherited itemViewViewportEventFilter(Sender, Event);
QEventMouseButtonRelease, QEventMouseButtonRelease,
QEventMouseButtonPress, QEventMouseButtonPress,
QEventMouseButtonDblClick: QEventMouseButtonDblClick:
@ -14436,6 +14473,8 @@ begin
inherited AttachEvents; inherited AttachEvents;
FSectionClicked := QHeaderView_hook_create(Widget); FSectionClicked := QHeaderView_hook_create(Widget);
QHeaderView_hook_hook_sectionClicked(FSectionClicked, @SignalSectionClicked); QHeaderView_hook_hook_sectionClicked(FSectionClicked, @SignalSectionClicked);
if csDesigning in LCLObject.ComponentState then
QWidget_setAutoFillBackground(viewportWidget, False);
end; end;
procedure TQtHeaderView.DetachEvents; procedure TQtHeaderView.DetachEvents;
@ -14467,6 +14506,8 @@ end;
function TQtHeaderView.itemViewViewportEventFilter(Sender: QObjectH; function TQtHeaderView.itemViewViewportEventFilter(Sender: QObjectH;
Event: QEventH): Boolean; cdecl; Event: QEventH): Boolean; cdecl;
var
R: TRect;
begin begin
Result := False; Result := False;
QEvent_accept(Event); QEvent_accept(Event);
@ -14879,6 +14920,16 @@ begin
QPaintEvent_rect(QPaintEventH(Event), @R); QPaintEvent_rect(QPaintEventH(Event), @R);
DC := TQtDeviceContext.Create(QWidgetH(Sender), True); DC := TQtDeviceContext.Create(QWidgetH(Sender), True);
try try
if csDesigning in LCLObject.ComponentState then
begin
if LCLObject.Color = clDefault then
begin
DC.save;
LCLIntf.SetBkColor(HDC(DC), ColorToRgb(clWindow));
DC.fillRect(R.Left, R.Top, R.Width, R.Height);
DC.restore;
end;
end;
TCustomListViewAccess(LCLObject).Canvas.handle := HDC(DC); TCustomListViewAccess(LCLObject).Canvas.handle := HDC(DC);
TCustomListViewAccess(LCLObject).IntfCustomDraw(dtControl, cdPrePaint, 0, 0, [], @R); TCustomListViewAccess(LCLObject).IntfCustomDraw(dtControl, cdPrePaint, 0, 0, [], @R);
finally finally
@ -15828,6 +15879,9 @@ begin
QTreeWidget_hook_hook_ItemActivated(FItemActivatedHook, @SignalItemActivated); QTreeWidget_hook_hook_ItemActivated(FItemActivatedHook, @SignalItemActivated);
QTreeWidget_hook_hook_ItemEntered(FItemEnteredHook, @SignalItemEntered); QTreeWidget_hook_hook_ItemEntered(FItemEnteredHook, @SignalItemEntered);
QTreeWidget_hook_hook_itemSelectionChanged(FSelectionChangedHook, @SignalSelectionChanged); QTreeWidget_hook_hook_itemSelectionChanged(FSelectionChangedHook, @SignalSelectionChanged);
if csDesigning in LCLObject.ComponentState then
QWidget_setAutoFillBackground(viewportWidget, False);
end; end;
procedure TQtTreeWidget.DetachEvents; procedure TQtTreeWidget.DetachEvents;
@ -19193,6 +19247,7 @@ var
R: TRect; R: TRect;
ASize: TSize; ASize: TSize;
AResizeEvent: QResizeEventH; AResizeEvent: QResizeEventH;
DC: TQtDeviceContext;
begin begin
{we install only mouse events on QAbstractItemView viewport} {we install only mouse events on QAbstractItemView viewport}
Result := False; Result := False;
@ -19212,6 +19267,20 @@ begin
end; end;
case QEvent_type(Event) of case QEvent_type(Event) of
QEventPaint:
begin
if (csDesigning in LCLObject.ComponentState) and (LCLObject.Color = clDefault) then
begin
QPaintEvent_rect(QPaintEventH(Event), @R);
DC := TQtDeviceContext.Create(QWidgetH(Sender), True);
try
LCLIntf.SetBkColor(HDC(DC), ColorToRgb(clWindow));
DC.fillRect(R.Left, R.Top, R.Width, R.Height);
finally
DC.Free;
end;
end;
end;
QEventResize: QEventResize:
begin begin
if Assigned(FOwner) then if Assigned(FOwner) then

69
lcl/interfaces/qt6/qtwidgets.pas
View File

@ -10412,6 +10412,8 @@ begin
// initialize scrollbars // initialize scrollbars
verticalScrollBar; verticalScrollBar;
horizontalScrollBar; horizontalScrollBar;
if csDesigning in LCLObject.ComponentState then
QWidget_setAutoFillBackground(viewportWidget, False);
end; end;
procedure TQtTextEdit.DetachEvents; procedure TQtTextEdit.DetachEvents;
@ -10437,6 +10439,9 @@ begin
end; end;
function TQtTextEdit.viewportEventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; function TQtTextEdit.viewportEventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl;
var
DC: TQtDeviceContext;
R: TRect;
begin begin
Result := False; Result := False;
QEvent_accept(Event); QEvent_accept(Event);
@ -10446,6 +10451,23 @@ begin
QEventMouseButtonRelease, QEventMouseButtonRelease,
QEventMouseButtonDblClick: Result := SlotMouse(Sender, Event); QEventMouseButtonDblClick: Result := SlotMouse(Sender, Event);
QEventMouseMove: Result := SlotMouseMove(Sender, Event); QEventMouseMove: Result := SlotMouseMove(Sender, Event);
QEventPaint:
begin
if csDesigning in LCLObject.ComponentState then
begin
if LCLObject.Color = clDefault then
begin
QPaintEvent_rect(QPaintEventH(Event), @R);
DC := TQtDeviceContext.Create(QWidgetH(Sender), True);
try
LCLIntf.SetBkColor(HDC(DC), ColorToRgb(clWindow));
DC.fillRect(R.Left, R.Top, R.Width, R.Height);
finally
DC.Free;
end;
end;
end;
end;
end; end;
end; end;
@ -12905,6 +12927,9 @@ begin
QListWidget_hook_hook_itemSelectionChanged(FSelectionChangeHook, @signalSelectionChanged); QListWidget_hook_hook_itemSelectionChanged(FSelectionChangeHook, @signalSelectionChanged);
QListWidget_hook_hook_itemClicked(FItemClickedHook, @signalItemClicked); QListWidget_hook_hook_itemClicked(FItemClickedHook, @signalItemClicked);
QListWidget_hook_hook_currentTextChanged(FItemTextChangedHook, @signalItemTextChanged); QListWidget_hook_hook_currentTextChanged(FItemTextChangedHook, @signalItemTextChanged);
if csDesigning in LCLObject.ComponentState then
QWidget_setAutoFillBackground(viewportWidget, False);
end; end;
procedure TQtListWidget.DetachEvents; procedure TQtListWidget.DetachEvents;
@ -13129,6 +13154,16 @@ begin
OwnerDataNeeded(R); OwnerDataNeeded(R);
DC := TQtDeviceContext.Create(QWidgetH(Sender), True); DC := TQtDeviceContext.Create(QWidgetH(Sender), True);
try try
if csDesigning in LCLObject.ComponentState then
begin
if LCLObject.Color = clDefault then
begin
DC.save;
LCLIntf.SetBkColor(HDC(DC), ColorToRgb(clWindow));
DC.fillRect(R.Left, R.Top, R.Width, R.Height);
DC.restore;
end;
end;
TCustomListViewAccess(LCLObject).Canvas.handle := HDC(DC); TCustomListViewAccess(LCLObject).Canvas.handle := HDC(DC);
TCustomListViewAccess(LCLObject).IntfCustomDraw(dtControl, cdPrePaint, 0, 0, [], @R); TCustomListViewAccess(LCLObject).IntfCustomDraw(dtControl, cdPrePaint, 0, 0, [], @R);
finally finally
@ -13332,6 +13367,7 @@ begin
end; end;
end else end else
case QEvent_type(Event) of case QEvent_type(Event) of
QEventPaint: Result := inherited itemViewViewportEventFilter(Sender, Event);
QEventMouseButtonPress, QEventMouseButtonPress,
QEventMouseButtonRelease, QEventMouseButtonRelease,
QEventMouseButtonDblClick: QEventMouseButtonDblClick:
@ -14161,6 +14197,7 @@ begin
if (LCLObject <> nil) then if (LCLObject <> nil) then
begin begin
case QEvent_type(Event) of case QEvent_type(Event) of
QEventPaint: Result := inherited itemViewViewportEventFilter(Sender, Event);
QEventMouseButtonRelease, QEventMouseButtonRelease,
QEventMouseButtonPress, QEventMouseButtonPress,
QEventMouseButtonDblClick: QEventMouseButtonDblClick:
@ -14355,6 +14392,8 @@ begin
inherited AttachEvents; inherited AttachEvents;
FSectionClicked := QHeaderView_hook_create(Widget); FSectionClicked := QHeaderView_hook_create(Widget);
QHeaderView_hook_hook_sectionClicked(FSectionClicked, @SignalSectionClicked); QHeaderView_hook_hook_sectionClicked(FSectionClicked, @SignalSectionClicked);
if csDesigning in LCLObject.ComponentState then
QWidget_setAutoFillBackground(viewportWidget, False);
end; end;
procedure TQtHeaderView.DetachEvents; procedure TQtHeaderView.DetachEvents;
@ -14386,6 +14425,8 @@ end;
function TQtHeaderView.itemViewViewportEventFilter(Sender: QObjectH; function TQtHeaderView.itemViewViewportEventFilter(Sender: QObjectH;
Event: QEventH): Boolean; cdecl; Event: QEventH): Boolean; cdecl;
var
R: TRect;
begin begin
Result := False; Result := False;
QEvent_accept(Event); QEvent_accept(Event);
@ -14798,6 +14839,16 @@ begin
QPaintEvent_rect(QPaintEventH(Event), @R); QPaintEvent_rect(QPaintEventH(Event), @R);
DC := TQtDeviceContext.Create(QWidgetH(Sender), True); DC := TQtDeviceContext.Create(QWidgetH(Sender), True);
try try
if csDesigning in LCLObject.ComponentState then
begin
if LCLObject.Color = clDefault then
begin
DC.save;
LCLIntf.SetBkColor(HDC(DC), ColorToRgb(clWindow));
DC.fillRect(R.Left, R.Top, R.Width, R.Height);
DC.restore;
end;
end;
TCustomListViewAccess(LCLObject).Canvas.handle := HDC(DC); TCustomListViewAccess(LCLObject).Canvas.handle := HDC(DC);
TCustomListViewAccess(LCLObject).IntfCustomDraw(dtControl, cdPrePaint, 0, 0, [], @R); TCustomListViewAccess(LCLObject).IntfCustomDraw(dtControl, cdPrePaint, 0, 0, [], @R);
finally finally
@ -15748,6 +15799,9 @@ begin
QTreeWidget_hook_hook_ItemActivated(FItemActivatedHook, @SignalItemActivated); QTreeWidget_hook_hook_ItemActivated(FItemActivatedHook, @SignalItemActivated);
QTreeWidget_hook_hook_ItemEntered(FItemEnteredHook, @SignalItemEntered); QTreeWidget_hook_hook_ItemEntered(FItemEnteredHook, @SignalItemEntered);
QTreeWidget_hook_hook_itemSelectionChanged(FSelectionChangedHook, @SignalSelectionChanged); QTreeWidget_hook_hook_itemSelectionChanged(FSelectionChangedHook, @SignalSelectionChanged);
if csDesigning in LCLObject.ComponentState then
QWidget_setAutoFillBackground(viewportWidget, False);
end; end;
procedure TQtTreeWidget.DetachEvents; procedure TQtTreeWidget.DetachEvents;
@ -19110,6 +19164,7 @@ var
R: TRect; R: TRect;
ASize: TSize; ASize: TSize;
AResizeEvent: QResizeEventH; AResizeEvent: QResizeEventH;
DC: TQtDeviceContext;
begin begin
{we install only mouse events on QAbstractItemView viewport} {we install only mouse events on QAbstractItemView viewport}
Result := False; Result := False;
@ -19129,6 +19184,20 @@ begin
end; end;
case QEvent_type(Event) of case QEvent_type(Event) of
QEventPaint:
begin
if (csDesigning in LCLObject.ComponentState) and (LCLObject.Color = clDefault) then
begin
QPaintEvent_rect(QPaintEventH(Event), @R);
DC := TQtDeviceContext.Create(QWidgetH(Sender), True);
try
LCLIntf.SetBkColor(HDC(DC), ColorToRgb(clWindow));
DC.fillRect(R.Left, R.Top, R.Width, R.Height);
finally
DC.Free;
end;
end;
end;
QEventResize: QEventResize:
begin begin
if Assigned(FOwner) then if Assigned(FOwner) then