Changeset 93 for trunk/Packages/Common/UListViewSort.pas

Timestamp:

Jul 20, 2018, 10:25:06 AM (6 years ago)

Author:

chronos

Message:

• Modified: Updated Common, CoolTranslator and TemplateGenerics packages.
• Fixed: FormMain initialization was not completed if last opened file was not found.

Location:

trunk

Files:

• . (modified) (1 prop)
• Packages/Common/UListViewSort.pas (modified) (11 diffs)

trunk

@@ -6 +6 @@
 compiled
 heaptrclog.trc
+LazFuck.dbg

@@ -6 +6 @@
 compiled
 heaptrclog.trc
+LazFuck.dbg

trunk/Packages/Common/UListViewSort.pas

@@ -81 +81 @@
     FOnChange: TNotifyEvent;
     FStringGrid1: TStringGrid;
-    procedure DoOnKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
-    procedure DoOnResize(Sender: TObject);
+    procedure GridDoOnKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure GridDoOnResize(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;
@@ -110 +110 @@
 { TListViewFilter }
 
-procedure TListViewFilter.DoOnKeyUp(Sender: TObject; var Key: Word;
+procedure TListViewFilter.GridDoOnKeyUp(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
@@ -117 +117 @@
 end;
 
-procedure TListViewFilter.DoOnResize(Sender: TObject);
+procedure TListViewFilter.GridDoOnResize(Sender: TObject);
 begin
   FStringGrid1.DefaultRowHeight := FStringGrid1.Height;
@@ -135 +135 @@
   FStringGrid1.Options := [goFixedHorzLine, goFixedVertLine, goVertLine,
     goHorzLine, goRangeSelect, goEditing, goAlwaysShowEditor, goSmoothScroll];
-  FStringGrid1.OnKeyUp := DoOnKeyUp;
-  FStringGrid1.OnResize := DoOnResize;
+  FStringGrid1.OnKeyUp := GridDoOnKeyUp;
+  FStringGrid1.OnResize := GridDoOnResize;
 end;
 
@@ -142 +142 @@
 var
   I: Integer;
+  R: TRect;
 begin
   with FStringGrid1 do begin
-    //Columns.Clear;
     while Columns.Count > ListView.Columns.Count do Columns.Delete(Columns.Count - 1);
     while Columns.Count < ListView.Columns.Count do Columns.Add;
     for I := 0 to ListView.Columns.Count - 1 do begin
       Columns[I].Width := ListView.Columns[I].Width;
+      if Selection.Left = I then begin
+        R := CellRect(I, 0);
+        Editor.Left := R.Left + 2;
+        Editor.Width := R.Width - 4;
+      end;
     end;
   end;
@@ -197 +202 @@
   if AMsg.Msg = WM_NOTIFY then
   begin
-    Code := PHDNotify(vMsgNotify.NMHdr)^.Hdr.Code;
+    Code := NMHDR(PHDNotify(vMsgNotify.NMHdr)^.Hdr).Code;
     case Code of
       HDN_ENDTRACKA, HDN_ENDTRACKW:
@@ -353 +358 @@
   TP1: TPoint;
   XBias, YBias: Integer;
-  OldColor: TColor;
+  PenColor: TColor;
+  BrushColor: TColor;
   BiasTop, BiasLeft: Integer;
   Rect1: TRect;
@@ -365 +371 @@
   Item.Left := 0;
   GetCheckBias(XBias, YBias, BiasTop, BiasLeft, ListView);
-  OldColor := ListView.Canvas.Pen.Color;
+  PenColor := ListView.Canvas.Pen.Color;
+  BrushColor := ListView.Canvas.Brush.Color;
   //TP1 := Item.GetPosition;
   lRect := Item.DisplayRect(drBounds); // Windows 7 workaround
@@ -377 +384 @@
   ItemLeft := Item.Left;
   ItemLeft := 23; // Windows 7 workaround
-  
+
   Rect1.Left := ItemLeft - CheckWidth - BiasLeft + 1 + XBias;
   //ShowMessage(IntToStr(Tp1.Y) + ', ' + IntToStr(BiasTop) + ', ' + IntToStr(XBias));
@@ -408 +415 @@
   end;
   //ListView.Canvas.Brush.Color := ListView.Color;
-  ListView.Canvas.Brush.Color := clWindow;
-  ListView.Canvas.Pen.Color := OldColor;
+  ListView.Canvas.Brush.Color := BrushColor;
+  ListView.Canvas.Pen.Color := PenColor;
 end;
 
@@ -476 +483 @@
     FHeaderHandle := ListView_GetHeader(FListView.Handle);
     for I := 0 to FListView.Columns.Count - 1 do begin
+      {$push}{$warn 5057 off}
       FillChar(Item, SizeOf(THDItem), 0);
+      {$pop}
       Item.Mask := HDI_FORMAT;
       Header_GetItem(FHeaderHandle, I, Item);

@@ -6 +6 @@
 compiled
 heaptrclog.trc
+LazFuck.dbg