potential fix for issue #860: tooltip always disappears after a second

(cherry picked from commit 747dd14)
TES5Edit · Jul 9, 2021 · 108b1b4 · 108b1b4
1 parent e722c14
commit 108b1b4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/External/VirtualTrees b/External/VirtualTrees
diff --git a/whatsnew.md b/whatsnew.md
@@ -22,6 +22,7 @@ There are a large number of changes between 4.0.x and 4.1.x which aren't current
 * #848 - Records with hardcoded FormIDs show as new records instead of overrides/injected
 * #853 - FNV - cleaning dead money master erases map geometry
 * #855 - After cleaning dlcnukaworld.esm, items in Nuka-Town market vanish
+* #860 - tooltip always disappears after a second
 * #863 - FO4: DefaultObject forms (DFOB) should override via EditorID
 * #871 - Updates for Static Collections [FO4] 
 * #875 - TES4Edit 4.0.3 not able to copy Magic Effect Records

diff --git a/xEdit/xeMainForm.dfm b/xEdit/xeMainForm.dfm
@@ -134,7 +134,6 @@ object frmMain: TfrmMain
             OnFreeNode = vstViewFreeNode
             OnGetText = vstViewGetText
             OnPaintText = vstViewPaintText
-            OnGetHint = vstViewGetHint
             OnHeaderClick = vstViewHeaderClick
             OnHeaderDrawQueryElements = vstViewHeaderDrawQueryElements
             OnHeaderMouseDown = vstViewHeaderMouseDown
@@ -791,7 +790,6 @@ object frmMain: TfrmMain
             OnFreeNode = vstSpreadSheetFreeNode
             OnGetText = vstSpreadSheetGetText
             OnPaintText = vstSpreadSheetPaintText
-            OnGetHint = vstSpreadSheetGetHint
             OnHeaderClick = vstNavHeaderClick
             OnIncrementalSearch = vstSpreadSheetIncrementalSearch
             OnInitNode = vstSpreadSheetWeaponInitNode
@@ -996,7 +994,6 @@ object frmMain: TfrmMain
             OnFreeNode = vstSpreadSheetFreeNode
             OnGetText = vstSpreadSheetGetText
             OnPaintText = vstSpreadSheetPaintText
-            OnGetHint = vstSpreadSheetGetHint
             OnHeaderClick = vstNavHeaderClick
             OnIncrementalSearch = vstSpreadSheetIncrementalSearch
             OnInitNode = vstSpreadSheetArmorInitNode
@@ -1137,7 +1134,6 @@ object frmMain: TfrmMain
             OnFreeNode = vstSpreadSheetFreeNode
             OnGetText = vstSpreadSheetGetText
             OnPaintText = vstSpreadSheetPaintText
-            OnGetHint = vstSpreadSheetGetHint
             OnHeaderClick = vstNavHeaderClick
             OnIncrementalSearch = vstSpreadSheetIncrementalSearch
             OnInitNode = vstSpreadSheetAmmoInitNode

diff --git a/xEdit/xeMainForm.pas b/xEdit/xeMainForm.pas
@@ -541,7 +541,6 @@   TfrmMain = class(TForm)
     procedure vstViewFocusChanging(Sender: TBaseVirtualTree; OldNode, NewNode: PVirtualNode; OldColumn, NewColumn: TColumnIndex; var Allowed: Boolean);
     procedure vstViewFreeNode(Sender: TBaseVirtualTree; Node: PVirtualNode);
     procedure vstViewGetEditText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; var CellText: string);
-    procedure vstViewGetHint(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; var LineBreakStyle: TVTTooltipLineBreakStyle; var HintText: string);
     procedure vstViewGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; var CellText: string);
     procedure vstViewHeaderClick(Sender: TVTHeader; HitInfo: TVTHeaderHitInfo);
     procedure vstViewHeaderDropped(Sender: TVTHeader; SourceColumn, TargetColumn: TColumnIndex; var Handled: Boolean);
@@ -601,7 +600,6 @@   TfrmMain = class(TForm)
     procedure vstSpreadSheetEditing(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; var Allowed: Boolean);
     procedure vstSpreadSheetFreeNode(Sender: TBaseVirtualTree; Node: PVirtualNode);
     procedure vstSpreadSheetGetEditText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; var CellText: string);
-    procedure vstSpreadSheetGetHint(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; var LineBreakStyle: TVTTooltipLineBreakStyle; var HintText: string);
     procedure vstSpreadSheetGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; var CellText: string);
     procedure vstSpreadSheetIncrementalSearch(Sender: TBaseVirtualTree; Node: PVirtualNode; const SearchText: string; var Result: Integer);
     procedure vstSpreadSheetNewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; NewText: string);
@@ -17580,14 +17578,6 @@ procedure TfrmMain.vstViewGetEditText(Sender: TBaseVirtualTree;
     CellText := Element.EditValue;
 end;
 
-procedure TfrmMain.vstViewGetHint(Sender: TBaseVirtualTree; Node: PVirtualNode;
-  Column: TColumnIndex; var LineBreakStyle: TVTTooltipLineBreakStyle;
-  var HintText: string);
-begin
-  if GetKeyState(VK_SHIFT) < 0 then
-    HintText := vstView.Text[Node, Column, False];
-end;
-
 procedure TfrmMain.vstViewGetText(Sender: TBaseVirtualTree;
   Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType;
   var CellText: string);
@@ -19430,14 +19420,6 @@ procedure TfrmMain.vstSpreadSheetClick(Sender: TObject);
   end;
 end;
 
-procedure TfrmMain.vstSpreadSheetGetHint(Sender: TBaseVirtualTree;
-  Node: PVirtualNode; Column: TColumnIndex;
-  var LineBreakStyle: TVTTooltipLineBreakStyle; var HintText: string);
-begin
-  if GetKeyState(VK_SHIFT) < 0 then
-    HintText := TVirtualEditTree(Sender).Text[Node, Column, False];
-end;
-
 procedure TfrmMain.vstSpreadSheetIncrementalSearch(Sender: TBaseVirtualTree; Node: PVirtualNode; const SearchText: string; var Result: Integer);
 var
   CompareText                 : string;
@@ -19982,6 +19964,8 @@ procedure TfrmMain.WMUser5(var Message: TMessage);
 end;
 
 procedure TfrmMain.UpdateActions;
+var
+  HintMode: TVTHintMode;
 begin
   if DelayedExpandView then begin
     DelayedExpandView := False;
@@ -19990,6 +19974,18 @@ procedure TfrmMain.UpdateActions;
   if Enabled and pnlClient.Enabled then
     NavUpdate(False);
   inherited;
+
+  if GetAsyncKeyState(VK_SHIFT) and $8000 <> 0 then
+    HintMode := hmTooltip
+  else
+    HintMode := hmDefault;
+
+  if HintMode <> vstView.HintMode then begin
+    vstView.HintMode := HintMode;
+    vstSpreadSheetWeapon.HintMode := HintMode;
+    vstSpreadsheetArmor.HintMode := HintMode;
+    vstSpreadSheetAmmo.HintMode := HintMode;
+  end;
 end;
 
 procedure TfrmMain.UpdateActiveFromPluggyLink;