Changeset 100 for trunk

Timestamp:

Aug 31, 2016, 9:57:15 AM (8 years ago)

Author:

chronos

Message:

• Added: Resize ListView filter column width according ListView column width.
• Fixed: Row height in ListView to respect visual styles.

Location:

trunk

Files:

• AcronymDecoder.lpi (modified) (1 diff)
• Forms/UFormAcronyms.lfm (modified) (3 diffs)
• Forms/UFormAcronyms.pas (modified) (2 diffs)
• Forms/UFormImportSources.lfm (modified) (1 diff)
• Forms/UFormImportSources.pas (modified) (3 diffs)
• Forms/UFormMain.lfm (modified) (4 diffs)
• Forms/UFormMain.pas (modified) (2 diffs)
• Packages/Common/UListViewSort.pas (modified) (9 diffs)

trunk/AcronymDecoder.lpi

@@ -212 +212 @@
       <local>
         <FormatVersion Value="1"/>
+        <CommandLineParams Value="&quot;c:\Users\h160817\Projects\fpc\Acronym Decoder\trunk\Example acronyms.adp&quot;"/>
       </local>
     </RunParams>

trunk/Forms/UFormAcronyms.lfm

@@ -53 +53 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 28
-    Top = 530
+    Height = 24
+    Top = 534
     Width = 740
     Panels = <    
@@ -68 +68 @@
     Left = 0
     Height = 26
-    Top = 504
+    Top = 508
     Width = 740
     Align = alBottom
@@ -96 +96 @@
     OnCompareItem = ListViewSort1CompareItem
     OnFilter = ListViewSort1Filter
+    OnColumnWidthChanged = ListViewSort1ColumnWidthChanged
     Column = 0
     Order = soUp

trunk/Forms/UFormAcronyms.pas

@@ -45 +45 @@
       Selected: Boolean);
     procedure ListViewFilter1Change(Sender: TObject);
+    procedure ListViewSort1ColumnWidthChanged(Sender: TObject);
     function ListViewSort1CompareItem(Item1, Item2: TObject): Integer;
     procedure ListViewSort1Filter(ListViewSort: TListViewSort);
@@ -235 +236 @@
 end;
 
+procedure TFormAcronyms.ListViewSort1ColumnWidthChanged(Sender: TObject);
+begin
+  ListViewFilter1.UpdateFromListView(ListViewAcronyms);
+end;
+
 function TFormAcronyms.ListViewSort1CompareItem(Item1, Item2: TObject): Integer;
 begin

trunk/Forms/UFormImportSources.lfm

@@ -307 +307 @@
     OnCompareItem = ListViewSort1CompareItem
     OnFilter = ListViewSort1Filter
+    OnColumnWidthChanged = ListViewSort1ColumnWidthChanged
     Column = 0
     Order = soNone

trunk/Forms/UFormImportSources.pas

@@ -56 +56 @@
       Selected: Boolean);
     procedure ListViewFilter1Change(Sender: TObject);
+    procedure ListViewSort1ColumnWidthChanged(Sender: TObject);
     function ListViewSort1CompareItem(Item1, Item2: TObject): Integer;
     procedure ListViewSort1Filter(ListViewSort: TListViewSort);
@@ -128 +129 @@
 end;
 
+procedure TFormImportSources.ListViewSort1ColumnWidthChanged(Sender: TObject);
+begin
+  ListViewFilter1.UpdateFromListView(ListView1);
+end;
+
 function TFormImportSources.ListViewSort1CompareItem(Item1, Item2: TObject
   ): Integer;
@@ -235 +241 @@
 var
   NewImportSource: TImportSource;
-  I: Integer;
 begin
   if Assigned(ListView1.Selected) then begin

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 603
+  Left = 454
   Height = 446
-  Top = 342
+  Top = 401
   Width = 782
   Caption = 'Acronym Decoder'
-  ClientHeight = 421
+  ClientHeight = 422
   ClientWidth = 782
   Menu = MainMenu1
@@ -17 +17 @@
   object Panel1: TPanel
     Left = 0
-    Height = 395
+    Height = 396
     Top = 26
     Width = 782
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 395
+    ClientHeight = 396
     ClientWidth = 782
     TabOrder = 1
     object CheckBoxExactMath: TCheckBox
       Left = 8
-      Height = 24
+      Height = 21
       Top = 3
-      Width = 104
+      Width = 102
       Caption = 'Exact match'
       OnChange = CheckBoxExactMathChange
@@ -44 +44 @@
     object ListViewAcronyms: TListView
       Left = 8
-      Height = 323
+      Height = 324
       Top = 64
       Width = 767
@@ -1434 +1434 @@
     OnCompareItem = ListViewSort1CompareItem
     OnFilter = ListViewSort1Filter
+    OnColumnWidthChanged = ListViewSort1ColumnWidthChanged
     Column = 0
     Order = soUp

trunk/Forms/UFormMain.pas

@@ -116 +116 @@
       Selected: Boolean);
     procedure ListViewFilter1Change(Sender: TObject);
+    procedure ListViewSort1ColumnWidthChanged(Sender: TObject);
     function ListViewSort1CompareItem(Item1, Item2: TObject): Integer;
     procedure ListViewSort1Filter(ListViewSort: TListViewSort);
@@ -452 +453 @@
 begin
   UpdateAcronymsList;
+end;
+
+procedure TFormMain.ListViewSort1ColumnWidthChanged(Sender: TObject);
+begin
+  ListViewFilter1.UpdateFromListView(ListViewAcronyms);
 end;
 

trunk/Packages/Common/UListViewSort.pas

@@ -18 +18 @@
   TCompareEvent = function (Item1, Item2: TObject): Integer of object;
   TListFilterEvent = procedure (ListViewSort: TListViewSort) of object;
+
+  { TListViewSort }
 
   TListViewSort = class(TComponent)
@@ -28 +30 @@
     FColumn: Integer;
     FOrder: TSortOrder;
+    FOldListViewWindowProc: TWndMethod;
+    FOnColumnWidthChanged: TNotifyEvent;
+    procedure DoColumnBeginResize(const AColIndex: Integer);
+    procedure DoColumnResized(const AColIndex: Integer);
+    procedure DoColumnResizing(const AColIndex, AWidth: Integer);
     procedure SetListView(const Value: TListView);
     procedure ColumnClick(Sender: TObject; Column: TListColumn);
@@ -40 +47 @@
     procedure SetColumn(const Value: Integer);
     procedure SetOrder(const Value: TSortOrder);
+    procedure NewListViewWindowProc(var AMsg: TMessage);
   public
     List: TListObject;
@@ -58 +66 @@
     property OnCustomDraw: TLVCustomDrawItemEvent read FOnCustomDraw
       write FOnCustomDraw;
+    property OnColumnWidthChanged: TNotifyEvent read FOnColumnWidthChanged
+      write FOnColumnWidthChanged;
     property Column: Integer read FColumn write SetColumn;
     property Order: TSortOrder read FOrder write SetOrder;
@@ -69 +79 @@
     FStringGrid1: TStringGrid;
     procedure DoOnKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure DoOnResize(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;
@@ -102 +113 @@
 end;
 
+procedure TListViewFilter.DoOnResize(Sender: TObject);
+begin
+  FStringGrid1.DefaultRowHeight := FStringGrid1.Height;
+end;
+
 constructor TListViewFilter.Create(AOwner: TComponent);
 begin
@@ -116 +132 @@
     goHorzLine, goRangeSelect, goEditing, goAlwaysShowEditor, goSmoothScroll];
   FStringGrid1.OnKeyUp := DoOnKeyUp;
+  FStringGrid1.OnResize := DoOnResize;
 end;
 
@@ -163 +180 @@
 { TListViewSort }
 
+procedure TListViewSort.NewListViewWindowProc(var AMsg: TMessage);
+var
+  vColWidth: Integer;
+  vMsgNotify: TWMNotify absolute AMsg;
+  Code: Integer;
+begin
+  // call the old WindowProc of ListView
+  FOldListViewWindowProc(AMsg);
+
+  // Currently we care only with WM_NOTIFY message
+  if AMsg.Msg = WM_NOTIFY then
+  begin
+    Code := PHDNotify(vMsgNotify.NMHdr)^.Hdr.Code;
+    case Code of
+      HDN_ENDTRACKA, HDN_ENDTRACKW:
+        DoColumnResized(PHDNotify(vMsgNotify.NMHdr)^.Item);
+
+      HDN_BEGINTRACKA, HDN_BEGINTRACKW:
+        DoColumnBeginResize(PHDNotify(vMsgNotify.NMHdr)^.Item);
+
+      HDN_TRACKA, HDN_TRACKW:
+        begin
+          vColWidth := -1;
+          if (PHDNotify(vMsgNotify.NMHdr)^.PItem<>nil)
+             and (PHDNotify(vMsgNotify.NMHdr)^.PItem^.Mask and HDI_WIDTH <> 0)
+          then
+            vColWidth := PHDNotify(vMsgNotify.NMHdr)^.PItem^.cxy;
+
+          DoColumnResizing(PHDNotify(vMsgNotify.NMHdr)^.Item, vColWidth);
+        end;
+    end;
+  end;
+end;
+
+procedure TListViewSort.DoColumnBeginResize(const AColIndex: Integer);
+begin
+end;
+
+procedure TListViewSort.DoColumnResizing(const AColIndex, AWidth: Integer);
+begin
+end;
+
+procedure TListViewSort.DoColumnResized(const AColIndex: Integer);
+begin
+  if Assigned(FOnColumnWidthChanged) then
+    FOnColumnWidthChanged(Self);
+end;
 
 procedure TListViewSort.ColumnClick(Sender: TObject; Column: TListColumn);
@@ -189 +253 @@
 procedure TListViewSort.SetListView(const Value: TListView);
 begin
+  if FListView = Value then Exit;
+  if Assigned(FListView) then
+    ListView.WindowProc := FOldListViewWindowProc;
   FListView := Value;
   FListView.OnColumnClick := ColumnClick;
   FListView.OnCustomDrawItem := ListViewCustomDrawItem;
   FListView.OnClick := ListViewClick;
+  FOldListViewWindowProc := FListView.WindowProc;
+  FListView.WindowProc := NewListViewWindowProc;
 end;