Changeset 463 for branches/highdpi/Packages/Common/ListViewSort.pas

Timestamp:

Nov 29, 2023, 2:35:44 PM (6 months ago)

Author:

chronos

Message:

• Modified: HighDpi branch updated to trunk version.

File:

• branches/highdpi/Packages/Common/ListViewSort.pas (moved) (moved from branches/highdpi/Packages/Common/UListViewSort.pas ) (16 diffs)

branches/highdpi/Packages/Common/ListViewSort.pas

@@ -1 @@
-unit UListViewSort;
+unit ListViewSort;
 
 // Date: 2019-05-17
-
-{$mode delphi}
 
 interface
@@ -9 +7 @@
 uses
   UDpiControls, {$IFDEF Windows}Windows, CommCtrl, LMessages, {$ENDIF}Classes, Graphics, ComCtrls, SysUtils,
-  Controls, DateUtils, Dialogs, fgl, Forms, Grids, StdCtrls, ExtCtrls,
-  LclIntf, LclType, LResources;
+  Controls, DateUtils, Dialogs, Forms, Grids, StdCtrls, ExtCtrls,
+  LclIntf, LclType, LResources, Generics.Collections, Generics.Defaults;
 
 type
@@ -19 +17 @@
   TCompareEvent = function (Item1, Item2: TObject): Integer of object;
   TListFilterEvent = procedure (ListViewSort: TListViewSort) of object;
+
+  TObjects = TObjectList<TObject>;
 
   { TListViewSort }
@@ -27 +27 @@
     FOnCompareItem: TCompareEvent;
     FOnFilter: TListFilterEvent;
-    FOnCustomDraw: TLVCustomDrawItemEvent;
+    FOnCustomDraw: TDpiLVCustomDrawItemEvent;
     {$IFDEF Windows}FHeaderHandle: HWND;{$ENDIF}
     FColumn: Integer;
@@ -42 +42 @@
     procedure GetCheckBias(var XBias, YBias, BiasTop, BiasLeft: Integer;
       const ListView: TDpiListView);
-    procedure ListViewCustomDrawItem(Sender: TCustomListView;
+    procedure ListViewCustomDrawItem(Sender: TDpiCustomListView;
       Item: TListItem; State: TCustomDrawState; var DefaultDraw: Boolean);
     procedure ListViewClick(Sender: TObject);
@@ -52 +52 @@
     {$ENDIF}
   public
-    List: TFPGObjectList<TObject>;
-    Source: TFPGObjectList<TObject>;
+    Source: TObjects;
+    List: TObjects;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -67 +67 @@
     property OnFilter: TListFilterEvent read FOnFilter
       write FOnFilter;
-    property OnCustomDraw: TLVCustomDrawItemEvent read FOnCustomDraw
+    property OnCustomDraw: TDpiLVCustomDrawItemEvent read FOnCustomDraw
       write FOnCustomDraw;
     property OnColumnWidthChanged: TNotifyEvent read FOnColumnWidthChanged
@@ -81 +81 @@
     FOnChange: TNotifyEvent;
     FStringGrid1: TDpiStringGrid;
+    procedure DoOnChange;
     procedure GridDoOnKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure GridDoOnResize(Sender: TObject);
@@ -90 +91 @@
     function TextEnteredColumn(Index: Integer): Boolean;
     function GetColValue(Index: Integer): string;
+    procedure Reset;
     property StringGrid: TDpiStringGrid read FStringGrid1 write FStringGrid1;
   published
@@ -147 +149 @@
 destructor TListViewEx.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 
 { TListViewFilter }
+
+procedure TListViewFilter.DoOnChange;
+begin
+  if Assigned(FOnChange) then FOnChange(Self);
+end;
 
 procedure TListViewFilter.GridDoOnKeyUp(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
-  if Assigned(FOnChange) then
-    FOnChange(Self);
+  DoOnChange;
 end;
 
@@ -229 +235 @@
 end;
 
+procedure TListViewFilter.Reset;
+var
+  I: Integer;
+begin
+  with StringGrid do
+  for I := 0 to ColCount - 1 do
+    Cells[I, 0] := '';
+  DoOnChange;
+end;
+
 { TListViewSort }
 
@@ -322 +338 @@
   ListViewSortCompare: TCompareEvent;
 
-function ListViewCompare(const Item1, Item2: TObject): Integer;
+function ListViewCompare(constref Item1, Item2: TObject): Integer;
 begin
   Result := ListViewSortCompare(Item1, Item2);
@@ -333 +349 @@
   ListViewSortCompare := Compare;
   if (List.Count > 0) then
-    List.Sort(ListViewCompare);
+    List.Sort(TComparer<TObject>.Construct(ListViewCompare));
 end;
 
@@ -339 +355 @@
 begin
   if Assigned(FOnFilter) then FOnFilter(Self)
-  else if Assigned(Source) then
-    List.Assign(Source) else
+  else if Assigned(Source) then begin
     List.Clear;
+    List.AddRange(Source);
+  end else List.Clear;
   if ListView.Items.Count <> List.Count then
     ListView.Items.Count := List.Count;
@@ -396 +413 @@
 begin
   inherited;
-  List := TFPGObjectList<TObject>.Create;
-  List.FreeObjects := False;
+  List := TObjects.Create;
+  List.OwnsObjects := False;
 end;
 
 destructor TListViewSort.Destroy;
 begin
-  List.Free;
+  FreeAndNil(List);
   inherited;
 end;
@@ -491 +508 @@
 end;
 
-procedure TListViewSort.ListViewCustomDrawItem(Sender: TCustomListView;
+procedure TListViewSort.ListViewCustomDrawItem(Sender: TDpiCustomListView;
   Item: TListItem; State: TCustomDrawState; var DefaultDraw: Boolean);
 begin