paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-11 11:58:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL/TColorButton: Add missing Notification method to prevent crash when assigned ColorDialog is deleted.

Browse Source
This commit is contained in:
wp_xyz 2021-12-16 00:37:00 +01:00
parent e0c4d9c77b
commit 285ed6ea0d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/dialogs.pp
View File

@ -312,6 +312,7 @@ type
function GetDisabledPattern: TBitmap; virtual; function GetDisabledPattern: TBitmap; virtual;
function GetGlyphSize(Drawing: Boolean; PaintRect: TRect): TSize; override; function GetGlyphSize(Drawing: Boolean; PaintRect: TRect): TSize; override;
class function GetControlClassDefaultSize: TSize; override; class function GetControlClassDefaultSize: TSize; override;
procedure Notification(AComponent: TComponent; Operation: TOperation); override;
procedure ShowColorDialog; virtual; procedure ShowColorDialog; virtual;
public public
constructor Create(AnOwner: TComponent); override; constructor Create(AnOwner: TComponent); override;

7
lcl/include/colorbutton.inc
View File

@ -148,6 +148,13 @@ begin
Result.CY := 25; Result.CY := 25;
end; end;
procedure TColorButton.Notification(AComponent: TComponent; Operation: TOperation);
begin
inherited Notification(AComponent, Operation);
if (Operation = opRemove) and (AComponent = FColorDialog) then
FColorDialog := nil;
end;
procedure TColorButton.SetButtonColorSize(const AValue: Integer); procedure TColorButton.SetButtonColorSize(const AValue: Integer);
begin begin
if FButtonColorSize = AValue then Exit; if FButtonColorSize = AValue then Exit;