Changeset 189 for branches/generator/Packages/Common/UListViewSort.pas

Timestamp:

May 16, 2019, 11:35:07 PM (6 years ago)

Author:

chronos

Message:

• Modified: Update Common package.
• Removed: Unused TemplateGenerics package.

File:

• branches/generator/Packages/Common/UListViewSort.pas (modified) (6 diffs)

branches/generator/Packages/Common/UListViewSort.pas

@@ -9 +9 @@
 uses
   {$IFDEF Windows}Windows, CommCtrl, {$ENDIF}Classes, Graphics, ComCtrls, SysUtils,
-  Controls, DateUtils, Dialogs, SpecializedList, Forms, Grids, StdCtrls, ExtCtrls,
-  LclIntf, LMessages, LclType, LResources;
+  Controls, DateUtils, Dialogs, fgl, Forms, Grids, StdCtrls, ExtCtrls,
+  LclIntf, LclType, LResources;
 
 type
@@ -52 +52 @@
     {$ENDIF}
   public
-    List: TListObject;
-    Source: TListObject;
+    List: TFPGObjectList<TObject>;
+    Source: TFPGObjectList<TObject>;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -98 +98 @@
   end;
 
+  { TListViewEx }
+
+  TListViewEx = class(TWinControl)
+  private
+    FFilter: TListViewFilter;
+    FListView: TListView;
+    FListViewSort: TListViewSort;
+    procedure ResizeHanlder;
+  public
+    constructor Create(TheOwner: TComponent); override;
+    destructor Destroy; override;
+  published
+    property ListView: TListView read FListView write FListView;
+    property ListViewSort: TListViewSort read FListViewSort write FListViewSort;
+    property Filter: TListViewFilter read FFilter write FFilter;
+    property Visible;
+  end;
+
 procedure Register;
 
@@ -105 +123 @@
 procedure Register;
 begin
-  RegisterComponents('Common', [TListViewSort, TListViewFilter]);
+  RegisterComponents('Common', [TListViewSort, TListViewFilter, TListViewEx]);
+end;
+
+{ TListViewEx }
+
+procedure TListViewEx.ResizeHanlder;
+begin
+end;
+
+constructor TListViewEx.Create(TheOwner: TComponent);
+begin
+  inherited Create(TheOwner);
+  Filter := TListViewFilter.Create(Self);
+  Filter.Parent := Self;
+  Filter.Align := alBottom;
+  ListView := TListView.Create(Self);
+  ListView.Parent := Self;
+  ListView.Align := alClient;
+  ListViewSort := TListViewSort.Create(Self);
+  ListViewSort.ListView := ListView;
+end;
+
+destructor TListViewEx.Destroy;
+begin
+  inherited Destroy;
 end;
 
@@ -277 +319 @@
 end;
 
+var
+  ListViewSortCompare: TCompareEvent;
+
+function ListViewCompare(const Item1, Item2: TObject): Integer;
+begin
+  Result := ListViewSortCompare(Item1, Item2);
+end;
+
 procedure TListViewSort.Sort(Compare: TCompareEvent);
 begin
+  // TODO: Because TFLGObjectList compare handler is not class method,
+  // it is necessary to use simple function compare handler with local variable
+  ListViewSortCompare := Compare;
   if (List.Count > 0) then
-    List.Sort(Compare);
+    List.Sort(ListViewCompare);
 end;
 
@@ -343 +396 @@
 begin
   inherited;
-  List := TListObject.Create;
-  List.OwnsObjects := False;
+  List := TFPGObjectList<TObject>.Create;
+  List.FreeObjects := False;
 end;