revert to older virtualtreeview due to various bug on new virtualtree…

…view
riderkick · May 9, 2015 · e9440c3 · e9440c3
1 parent e8f195f
commit e9440c3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 31 deletions.
diff --git a/mangadownloader/forms/frmMain.lfm b/mangadownloader/forms/frmMain.lfm
@@ -42,14 +42,14 @@ object MainForm: TMainForm
     Height = 484
     Top = 12
     Width = 614
-    ActivePage = tsDownload
+    ActivePage = tsFavorites
     Align = alClient
     BorderSpacing.Top = 4
     BorderSpacing.Right = 4
     BorderSpacing.Bottom = 4
     Font.Style = [fsBold]
     ParentFont = False
-    TabIndex = 0
+    TabIndex = 3
     TabOrder = 0
     OnChange = pcMainChange
     object tsDownload: TTabSheet
@@ -66,7 +66,6 @@ object MainForm: TMainForm
         BorderSpacing.Top = 4
         BorderSpacing.Right = 4
         BorderSpacing.Bottom = 3
-        Colors.UnfocusedColor = clMedGray
         DefaultText = 'Node'
         DragOperations = [doMove]
         Header.AutoSizeIndex = 0
@@ -384,13 +383,11 @@ object MainForm: TMainForm
             Top = 2
             Width = 562
             Anchors = [akTop, akLeft, akRight, akBottom]
-            Colors.UnfocusedColor = clMedGray
             Colors.UnfocusedSelectionColor = clHighlight
             DefaultText = 'Node'
             Header.AutoSizeIndex = 0
             Header.Columns = <>
             Header.DefaultHeight = 17
-            Header.Height = 17
             Header.MainColumn = -1
             IncrementalSearch = isVisibleOnly
             Margin = 2
@@ -1375,7 +1372,6 @@ object MainForm: TMainForm
         BorderSpacing.Left = 2
         BorderSpacing.Top = 4
         BorderSpacing.Right = 4
-        Colors.UnfocusedColor = clMedGray
         DefaultText = 'Node'
         Header.AutoSizeIndex = 0
         Header.Columns = <        
@@ -2294,12 +2290,10 @@ object MainForm: TMainForm
             BorderSpacing.Right = 2
             BorderSpacing.Bottom = 2
             BorderSpacing.Around = 2
-            Colors.UnfocusedColor = clMedGray
             DefaultText = 'Node'
             Header.AutoSizeIndex = 0
             Header.Columns = <>
             Header.DefaultHeight = 17
-            Header.Height = 17
             Header.MainColumn = -1
             IncrementalSearch = isVisibleOnly
             Margin = 0
@@ -2593,12 +2587,10 @@ object MainForm: TMainForm
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Right = 2
         BorderSpacing.Around = 2
-        Colors.UnfocusedColor = clMedGray
         DefaultText = 'Node'
         Header.AutoSizeIndex = 0
         Header.Columns = <>
         Header.DefaultHeight = 17
-        Header.Height = 17
         Header.MainColumn = -1
         HintMode = hmHint
         IncrementalSearch = isAll

diff --git a/mangadownloader/forms/frmMain.pas b/mangadownloader/forms/frmMain.pas
@@ -426,8 +426,8 @@   TMainForm = class(TForm)
       var Ghosted: Boolean; var ImageIndex: Integer);
     procedure vtDownloadGetText(Sender: TBaseVirtualTree; Node: PVirtualNode;
       Column: TColumnIndex; TextType: TVSTTextType; var CellText: String);
-    procedure vtDownloadHeaderClick(Sender: TVTHeader; HitInfo: TVTHeaderHitInfo
-      );
+    procedure vtDownloadHeaderClick(Sender: TVTHeader; Column: TColumnIndex;
+      Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
     procedure vtDownloadInitNode(Sender: TBaseVirtualTree;
       ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates);
     procedure vtDownloadKeyDown(Sender : TObject; var Key : Word;
@@ -447,8 +447,8 @@   TMainForm = class(TForm)
       var Ghosted: Boolean; var ImageIndex: Integer);
     procedure vtFavoritesGetText(Sender: TBaseVirtualTree; Node: PVirtualNode;
       Column: TColumnIndex; TextType: TVSTTextType; var CellText: String);
-    procedure vtFavoritesHeaderClick(Sender: TVTHeader;
-      HitInfo: TVTHeaderHitInfo);
+    procedure vtFavoritesHeaderClick(Sender: TVTHeader; Column: TColumnIndex;
+      Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
     procedure vtFavoritesInitNode(Sender: TBaseVirtualTree;
       ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates);
     procedure vtMangaListChange(Sender: TBaseVirtualTree; Node: PVirtualNode);
@@ -3369,22 +3369,20 @@ procedure TMainForm.vtDownloadGetText(Sender: TBaseVirtualTree;
 end;
 
 procedure TMainForm.vtDownloadHeaderClick(Sender: TVTHeader;
-  HitInfo: TVTHeaderHitInfo);
+  Column: TColumnIndex; Button: TMouseButton; Shift: TShiftState; X, Y: Integer
+  );
 begin
-  if (not (HitInfo.Column = 2)) and (DLManager.containers.Count > 1) then
+  if (not (Column = 2)) and (DLManager.containers.Count > 1) then
   begin
-    with HitInfo do try
-      DLManager.SortColumn := Column;
-      DLManager.SortDirection := not DLManager.SortDirection;
-      vtDownload.Header.SortDirection := TSortDirection(DLManager.SortDirection);
-      vtDownload.Header.SortColumn := Column;
-      //DLManager.Sort(Column);
-      DLManager.SortNatural(Column);    //Natural Sorting
-      options.WriteInteger('misc', 'SortDownloadColumn', vtDownload.Header.SortColumn);
-      options.WriteBool('misc', 'SortDownloadDirection', DLManager.SortDirection);
-    finally
-      vtDownload.Repaint;
-    end;
+    DLManager.SortColumn := Column;
+    DLManager.SortDirection := not DLManager.SortDirection;
+    vtDownload.Header.SortDirection := TSortDirection(DLManager.SortDirection);
+    vtDownload.Header.SortColumn := Column;
+    //DLManager.Sort(Column);
+    DLManager.SortNatural(Column);    //Natural Sorting
+    options.WriteInteger('misc', 'SortDownloadColumn', vtDownload.Header.SortColumn);
+    options.WriteBool('misc', 'SortDownloadDirection', DLManager.SortDirection);
+    vtDownload.Repaint;
   end;
 end;
 
@@ -3521,12 +3519,13 @@ procedure TMainForm.vtFavoritesGetText(Sender: TBaseVirtualTree;
 end;
 
 procedure TMainForm.vtFavoritesHeaderClick(Sender: TVTHeader;
-  HitInfo: TVTHeaderHitInfo);
+  Column: TColumnIndex; Button: TMouseButton; Shift: TShiftState; X, Y: Integer
+  );
 begin
-  if (not (HitInfo.Column = 0)) and (not FavoriteManager.isRunning) and (FavoriteManager.Count > 1) then
+  if (not (Column = 0)) and (not FavoriteManager.isRunning) and (FavoriteManager.Count > 1) then
   begin
     FavoriteManager.isRunning := True;
-    with HitInfo do try
+    try
       FavoriteManager.SortColumn := Column;
       FavoriteManager.sortDirection := not FavoriteManager.sortDirection;
       vtFavorites.Header.SortColumn := Column;