paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-13 12:39:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: TCustomListView: preserve selections when sorting items. issue #18716

Browse Source 
git-svn-id: trunk@31462 -
This commit is contained in:
zeljko 2011-06-29 21:18:08 +00:00
parent 9b30b68fdc
commit 3b3f7703dd
2 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lcl/comctrls.pp
View File

@ -1012,7 +1012,8 @@ type
TListViewFlag = ( TListViewFlag = (
lffSelectedValid, lffSelectedValid,
lffItemsMoving lffItemsMoving,
lffItemsSorting
); );
TListViewFlags = set of TListViewFlag; TListViewFlags = set of TListViewFlag;

60
lcl/include/customlistview.inc
View File

@ -447,8 +447,9 @@ end;
procedure TCustomListView.DoSelectItem(AItem: TListItem; ASelected: Boolean); procedure TCustomListView.DoSelectItem(AItem: TListItem; ASelected: Boolean);
begin begin
AItem.Selected:=ASelected; AItem.Selected:=ASelected;
if Assigned(FOnSelectItem) and not (lffItemsMoving in FFlags) then if Assigned(FOnSelectItem) and
FOnSelectItem(Self, AItem, ASelected); ([lffItemsMoving, lffItemsSorting] * FFlags = []) then
FOnSelectItem(Self, AItem, ASelected);
end; end;
{------------------------------------------------------------------------------} {------------------------------------------------------------------------------}
@ -693,12 +694,63 @@ end;
{ TCustomListView Sort } { TCustomListView Sort }
{------------------------------------------------------------------------------} {------------------------------------------------------------------------------}
procedure TCustomListView.Sort; procedure TCustomListView.Sort;
var
FSavedSelection: TFPList;
FSavedFocused: TListItem;
i: Integer;
AItemIndex: Integer;
begin begin
if FSortType = stNone then exit; if FSortType = stNone then exit;
if FListItems.Count < 2 then Exit; if FListItems.Count < 2 then Exit;
FListItems.FItems.Sort(@CompareItems);
if HandleAllocated then if HandleAllocated then
TWSCustomListViewClass(WidgetSetClass).SetSort(Self, FSortType, FSortColumn, FSortDirection); begin
Include(FFlags, lffItemsSorting);
FSavedSelection := TFPList.Create;
try
if (ItemIndex >= 0) then
FSavedFocused := Items[ItemIndex]
else
FSavedFocused := nil;
if Assigned(Selected) then
begin
FSavedSelection.Add(Selected);
if MultiSelect then
begin
for i := 0 to Items.Count-1 do
begin
if Items[i].Selected and (Items[i] <> Selected) then
FSavedSelection.Add(Items[i]);
end;
end;
end;
FListItems.FItems.Sort(@CompareItems);
TWSCustomListViewClass(WidgetSetClass).SetSort(Self, FSortType,
FSortColumn, FSortDirection);
if (FSavedSelection.Count > 0) or Assigned(FSavedFocused) then
begin
Selected := nil; // unselect all
if FSavedFocused <> nil then
TWSCustomListViewClass(WidgetSetClass).ItemSetState(Self,
FSavedFocused.Index, FSavedFocused, lisFocused, True);
for i := FSavedSelection.Count - 1 downto 0 do
begin
AItemIndex := Items.IndexOf(TListItem(FSavedSelection.Items[i]));
if AItemIndex <> -1 then
TWSCustomListViewClass(WidgetSetClass).ItemSetState(Self,
AItemIndex, Items[AItemIndex], lisSelected, True);
end;
end;
finally
FreeThenNil(FSavedSelection);
Exclude(FFlags, lffItemsSorting);
end;
end else
FListItems.FItems.Sort(@CompareItems);
end; end;
{------------------------------------------------------------------------------} {------------------------------------------------------------------------------}