enhance: light text color instead of ghosted/ugly icon for unseen tree nodes

ansgarbecker · ansgarbecker · commit 76aefb351cae · 2025-12-08T18:48:59.000+01:00
diff --git a/source/main.lfm b/source/main.lfm
@@ -968,7 +968,7 @@ object MainForm: TMainForm
         ShowHint = True
         TabOrder = 3
         TreeOptions.AutoOptions = [toAutoDropExpand, toAutoScrollOnExpand, toAutoSort, toAutoTristateTracking, toAutoHideButtons, toAutoDeleteMovedNodes, toAutoChangeScale]
-        TreeOptions.PaintOptions = [toHotTrack, toShowButtons, toShowDropmark, toShowRoot, toShowTreeLines, toThemeAware, toGhostedIfUnfocused, toUseExplorerTheme]
+        TreeOptions.PaintOptions = [toHotTrack, toShowButtons, toShowDropmark, toShowRoot, toShowTreeLines, toThemeAware, toUseBlendedImages, toGhostedIfUnfocused, toUseExplorerTheme]
         TreeOptions.SelectionOptions = [toFullRowSelect, toRightClickSelect]
         OnAfterCellPaint = DBtreeAfterCellPaint
         OnBeforeCellPaint = DBtreeBeforeCellPaint
diff --git a/source/main.pas b/source/main.pas
@@ -9559,20 +9559,8 @@ procedure TMainForm.DBtreeGetImageIndex(Sender: TBaseVirtualTree; Node:
     Exit;
   DBObj := Sender.GetNodeData(Node);
   case Kind of
-    ikNormal, ikSelected: begin
-        ImageIndex := DBObj.ImageIndex;
-        Ghosted := (DBObj.NodeType = lntNone) and (not DBObj.Connection.Active);
-        Ghosted := Ghosted or ((DBObj.NodeType = lntDB)
-          and (not DBObj.Connection.DbObjectsCached(DBObj.Database))
-          );
-        Ghosted := Ghosted or ((DBObj.NodeType = lntGroup)
-          and Sender.ChildrenInitialized[Node]
-          and (Sender.ChildCount[Node] = 0)
-          );
-        Ghosted := Ghosted or ((DBObj.NodeType in [lntTable..lntEvent])
-          and (not DBObj.WasSelected)
-          );
-      end;
+    ikNormal, ikSelected:
+      ImageIndex := DBObj.ImageIndex;
     ikOverlay:
       ImageIndex := DBObj.OverlayImageIndex;
   end;
@@ -10045,34 +10033,59 @@ procedure TMainForm.DBtreePaintText(Sender: TBaseVirtualTree; const
 var
   DBObj: PDBObject;
   WalkNode: PVirtualNode;
+  Ghosted: Boolean;
 begin
   // Grey out non-current connection nodes, and rather unimportant "Size" column
   DBObj := Sender.GetNodeData(Node);
-  if DBObj.Connection <> ActiveConnection then
-    TargetCanvas.Font.Color := clGrayText
-  else if (Column = 1) and (DBObj.NodeType in [lntTable..lntEvent]) then
+  if DBObj.Connection <> ActiveConnection then begin
     TargetCanvas.Font.Color := clGrayText;
+    Exit;
+  end;
 
-  // Set bold text if painted node is in focused path
-  if (Column = DBtree.Header.MainColumn) then begin
-    WalkNode := Sender.FocusedNode;
-    while Assigned(WalkNode) do begin
-      if WalkNode = Node then begin
-        TargetCanvas.Font.Style := TargetCanvas.Font.Style + [fsBold];
-        Break;
-      end;
-      try
-        // This crashes in some situations, which I could never reproduce.
-        // See uploaded crash reports and issue #1270.
-        WalkNode := Sender.NodeParent[WalkNode];
-      except
-        on E:EAccessViolation do begin
-          LogSQL('DBtreePaintText, NodeParent: '+E.Message, lcError);
+  case Column of
+    0: begin
+      // Set bold text if painted node is in focused path
+      WalkNode := Sender.FocusedNode;
+      while Assigned(WalkNode) do begin
+        if WalkNode = Node then begin
+          TargetCanvas.Font.Style := TargetCanvas.Font.Style + [fsBold];
           Break;
         end;
+        try
+          // This crashes in some situations, which I could never reproduce.
+          // See uploaded crash reports and issue #1270.
+          WalkNode := Sender.NodeParent[WalkNode];
+        except
+          on E:EAccessViolation do begin
+            LogSQL('DBtreePaintText, NodeParent: '+E.Message, lcError);
+            Break;
+          end;
+        end;
       end;
+
+      // Moved from OnGetImageIndex, where the icon used to be painted lighter if the node was yet unseen
+      Ghosted := (DBObj.NodeType = lntNone) and (not DBObj.Connection.Active);
+      Ghosted := Ghosted or ((DBObj.NodeType = lntDB)
+        and (not DBObj.Connection.DbObjectsCached(DBObj.Database))
+        );
+      Ghosted := Ghosted or ((DBObj.NodeType = lntGroup)
+        and Sender.ChildrenInitialized[Node]
+        and (Sender.ChildCount[Node] = 0)
+        );
+      Ghosted := Ghosted or ((DBObj.NodeType in [lntTable..lntEvent])
+        and (not DBObj.WasSelected)
+        );
+      if Ghosted then
+        TargetCanvas.Font.Color := clGrayText;
+
+    end;
+
+    1: begin
+      if DBObj.NodeType in [lntTable..lntEvent] then
+        TargetCanvas.Font.Color := clGrayText;
     end;
   end;
+
 end;
 
 
