paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 14:38:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazControls: Fix design time issues in FilterEdit controls. Issue #41321.

Browse Source
This commit is contained in:
Juha 2025-03-05 17:08:07 +02:00
parent 20d924570a
commit d6c7371e1f
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/lazcontrols/listfilteredit.pas
View File

@ -140,6 +140,12 @@ end;
procedure TListFilterEdit.SetFilteredListbox(const AValue: TCustomListBox);
begin
if fFilteredListbox = AValue then Exit;
if Assigned(fFilteredListbox) then
begin
fFilteredListbox.RemoveFreeNotification(Self);
InternalSetFilter('');
ApplyFilter(True);
end;
fFilteredListbox:=AValue;
if Assigned(fFilteredListbox) then
begin
@ -147,6 +153,7 @@ begin
fOriginalData.Assign(fFilteredListbox.Items);
if (fFilteredListbox is TCustomCheckListBox) and not Assigned(fCheckedItems) then
fCheckedItems:=TStringMap.Create(False);
fFilteredListbox.FreeNotification(Self);
end;
end;

9
components/lazcontrols/listviewfilteredit.pas
View File

@ -151,12 +151,19 @@ var
i: Integer;
begin
if fFilteredListview = AValue then Exit;
fFilteredListview:=AValue;
if Assigned(fFilteredListview) then
begin
fFilteredListview.RemoveFreeNotification(Self);
InternalSetFilter('');
ApplyFilter(True);
end;
fFilteredListview := AValue;
if Assigned(fFilteredListview) then
begin
InternalSetFilter(Text);
for i := 0 to fFilteredListview.Items.Count-1 do
fOriginalData.Add(ListItem2Data(fFilteredListview.Items[i]));
fFilteredListview.FreeNotification(Self);
end;
end;

4
components/lazcontrols/treefilteredit.pas
View File

@ -729,11 +729,13 @@ begin
begin
fFilteredTreeview.RemoveFreeNotification(Self);
fFilteredTreeview.RemoveHandlerOnBeforeDestruction(@OnBeforeTreeDestroy);
InternalSetFilter('');
ApplyFilter(True);
end;
fFilteredTreeview := AValue;
if fFilteredTreeview <> nil then
begin
InvalidateFilter;
InternalSetFilter(Text);
fFilteredTreeview.FreeNotification(Self);
fFilteredTreeview.AddHandlerOnBeforeDestruction(@OnBeforeTreeDestroy);
end;

15
lcl/editbtn.pas
View File

@ -121,7 +121,6 @@ type
property OnButtonClick: TNotifyEvent read GetOnButtonClick write SetOnButtonClick;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
end;
{ TEditButton }
@ -233,7 +232,6 @@ type
fSortData: Boolean; // Data needs to be sorted.
fIsFirstSetFormActivate: Boolean;
fOnAfterFilter: TNotifyEvent;
procedure ApplyFilter(Immediately: Boolean = False);
procedure SetFilter(AValue: string);
procedure SetFilterOptions(AValue: TFilterStringOptions);
procedure SetSortData(AValue: Boolean);
@ -259,6 +257,7 @@ type
procedure BuddyClick; override;
procedure SortAndFilter; virtual; abstract;
procedure ApplyFilterCore; virtual; abstract;
procedure ApplyFilter(Immediately: Boolean = False);
procedure MoveNext(ASelect: Boolean = False); virtual; abstract;
procedure MovePrev(ASelect: Boolean = False); virtual; abstract;
procedure MovePageUp(ASelect: Boolean = False); virtual; abstract;
@ -1170,18 +1169,13 @@ begin
Spacing := 4;
end;
destructor TCustomEditButton.Destroy;
begin
inherited Destroy;
end;
{ TCustomControlFilterEdit }
constructor TCustomControlFilterEdit.Create(AOwner: TComponent);
begin
inherited Create(AOwner);
ControlStyle := ControlStyle - [csSetCaption];
ControlStyle:=ControlStyle-[csSetCaption];
CharCase:=ecLowerCase;
Button.Enabled:=False;
fFilterOptions:=[];
@ -1192,7 +1186,7 @@ end;
destructor TCustomControlFilterEdit.Destroy;
begin
IdleConnected := False;
IdleConnected:=False;
inherited Destroy;
end;
@ -1204,7 +1198,6 @@ end;
procedure TCustomControlFilterEdit.InternalSetFilter(const AValue: string);
begin
if fFilter=AValue then Exit;
Button.Enabled:=AValue<>'';
fFilter:=AValue;
fFilterLowercase:=UTF8LowerCase(fFilter);
@ -1215,7 +1208,7 @@ procedure TCustomControlFilterEdit.SetFilter(AValue: string);
// AValue parameter must not have const modifier. It causes a crash, see issue #40300.
begin
if Text=AValue then Exit;
Text:=AValue; // ActivateFilter will be called by EditChange handler.
Text:=AValue; // ApplyFilter will be called by EditChange handler.
InternalSetFilter(AValue);
end;