Fixed some drawing issues in controls

couchcoding · Jun 30, 2022 · 1b88c91 · 1b88c91
1 parent cfb6409
commit 1b88c91
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 44 deletions.
diff --git a/src/Couchcoding.Logbert.Gui/Controls/TreeViewEx.cs b/src/Couchcoding.Logbert.Gui/Controls/TreeViewEx.cs
@@ -163,8 +163,6 @@ public void UseNativeSystemRendering(bool value)
         {
           CreateHandle();
         }
-
-        //Win32.SetWindowTheme(Handle, "Explorer", null);
       }
     }
 

diff --git a/src/Couchcoding.Logbert.Gui/Properties/AssemblyInfo.cs b/src/Couchcoding.Logbert.Gui/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Couchcoding")]
 [assembly: AssemblyProduct("Logbert Control Library")]
-[assembly: AssemblyCopyright("Copyright © 2021 Couchcoding")]
+[assembly: AssemblyCopyright("Copyright © 2022 Couchcoding")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.3.1")]
-[assembly: AssemblyFileVersion("1.6.3.1")]
+[assembly: AssemblyVersion("1.6.3.2")]
+[assembly: AssemblyFileVersion("1.6.3.2")]
diff --git a/src/Couchcoding.Logbert.Theme/Properties/AssemblyInfo.cs b/src/Couchcoding.Logbert.Theme/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Couchcoding")]
 [assembly: AssemblyProduct("Logbert Theme Library")]
-[assembly: AssemblyCopyright("Copyright © 2021 Couchcoding")]
+[assembly: AssemblyCopyright("Copyright © 2022 Couchcoding")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.3.1")]
-[assembly: AssemblyFileVersion("1.6.3.1")]
+[assembly: AssemblyVersion("1.6.3.2")]
+[assembly: AssemblyFileVersion("1.6.3.2")]
diff --git a/src/Logbert/Dialogs/Docking/FrmLogTree.cs b/src/Logbert/Dialogs/Docking/FrmLogTree.cs
@@ -42,7 +42,6 @@
 using System.Drawing;
 
 using Couchcoding.Logbert.Logging.Filter;
-using Couchcoding.Logbert.Theme.Palettes;
 using Couchcoding.Logbert.Theme.Interfaces;
 using Couchcoding.Logbert.Theme;
 using Couchcoding.Logbert.Theme.Themes;
@@ -160,7 +159,7 @@ private static void PopulateTreeView(TreeView treeView, string path)
 
           if (lastNode.Parent != null)
           {
-            lastNode.ForeColor = ThemeManager.CurrentApplicationTheme.ColorPalette.ContentForeground;
+            lastNode.ForeColor = ThemeManager.CurrentApplicationTheme.ColorPalette.ContentForegroundDimmed;
             lastNode.Parent.Expand();
           }
         }
@@ -178,11 +177,13 @@ private static void PopulateTreeView(TreeView treeView, string path)
           treeView.SelectedNode = treeView.Nodes[0];
         }
 
-        SetNodeColor(treeView.Nodes[0]
-          , ThemeManager.CurrentApplicationTheme.ColorPalette.ContentForeground
-          , ThemeManager.CurrentApplicationTheme.ColorPalette.SelectionForeground
-          , ThemeManager.CurrentApplicationTheme.ColorPalette.SelectionForegroundFocused
-          , false);
+        //ReColorNodes(treeView.Nodes[0], treeView.SelectedNode, false);
+
+        //SetNodeColor(treeView.Nodes[0]
+        //  , ThemeManager.CurrentApplicationTheme.ColorPalette.ContentForeground
+        //  , ThemeManager.CurrentApplicationTheme.ColorPalette.SelectionForeground
+        //  , ThemeManager.CurrentApplicationTheme.ColorPalette.SelectionForegroundFocused
+        //  , false);
       }
     }
 
@@ -223,6 +224,24 @@ private static void SetNodeColor(TreeNode startNode, Color nodeColor, Color node
       }
     }
 
+    private static void ReColorNodes(TreeNode rootNode, TreeNode node, bool recursive)
+    {
+      SetNodeColor(rootNode
+        , ThemeManager.CurrentApplicationTheme.ColorPalette.ContentForegroundDimmed
+          , ThemeManager.CurrentApplicationTheme.ColorPalette.SelectionForeground
+          , ThemeManager.CurrentApplicationTheme.ColorPalette.SelectionForegroundFocused
+        , true);
+
+      if (node != null)
+      {
+        SetNodeColor(node
+          , ThemeManager.CurrentApplicationTheme.ColorPalette.ContentForeground
+          , ThemeManager.CurrentApplicationTheme.ColorPalette.SelectionForeground
+          , ThemeManager.CurrentApplicationTheme.ColorPalette.SelectionForegroundFocused
+          , recursive);
+      }
+    }
+
     private void TvLoggerTreeAfterSelect(object sender, TreeViewEventArgs e)
     {
       if (tvLoggerTree.Nodes.Count == 0)
@@ -232,20 +251,7 @@ private void TvLoggerTreeAfterSelect(object sender, TreeViewEventArgs e)
 
       try
       {
-        SetNodeColor(tvLoggerTree.Nodes[0]
-          , ThemeManager.CurrentApplicationTheme.ColorPalette.ContentForegroundDimmed
-            , ThemeManager.CurrentApplicationTheme.ColorPalette.SelectionForeground
-            , ThemeManager.CurrentApplicationTheme.ColorPalette.SelectionForegroundFocused
-          , true);
-
-        if (e.Node != null)
-        {
-          SetNodeColor(e.Node
-            , ThemeManager.CurrentApplicationTheme.ColorPalette.ContentForeground
-            , ThemeManager.CurrentApplicationTheme.ColorPalette.SelectionForeground
-            , ThemeManager.CurrentApplicationTheme.ColorPalette.SelectionForegroundFocused
-            , tsbFilterRecursive.Checked);
-        }
+        ReColorNodes(tvLoggerTree.Nodes[0], e.Node, tsbFilterRecursive.Checked);
       }
       finally
       {
@@ -366,6 +372,10 @@ public void LogMessagesChanged(List<LogMessage> messages, int delta)
       finally
       {
         tvLoggerTree.AfterSelect += TvLoggerTreeAfterSelect;
+
+        ReColorNodes(tvLoggerTree.Nodes[0]
+        , tvLoggerTree.SelectedNode
+        , tsbFilterRecursive.Checked);
       }
     }
 
@@ -486,15 +496,12 @@ private void DrawPlusMinus(DrawTreeNodeEventArgs e)
         return;
       }
 
-      int indent   = (e.Node.Level * tvLoggerTree.Indent) + tvLoggerTree.Margin.Size.Width;
-      int iconLeft = indent + tvLoggerTree.Indent;
-
       Image img = e.Node.IsExpanded 
         ? ThemeManager.CurrentApplicationTheme.Resources.Images["FrmLogTreeNodeExpanded"]
         : ThemeManager.CurrentApplicationTheme.Resources.Images["FrmLogTreeNodeCollapsed"];
 
       e.Graphics.DrawImage(img
-        , iconLeft - img.Width - 2
+        , e.Node.Bounds.X - img.Width - 2
         , (e.Bounds.Y + (e.Bounds.Height >> 1)) - (img.Height >> 1) - 1);
     }
 

diff --git a/src/Logbert/Dialogs/FrmAbout.resx b/src/Logbert/Dialogs/FrmAbout.resx
@@ -120,7 +120,7 @@
   <data name="txtLicense.Text" xml:space="preserve">
     <value>The MIT License (MIT)
 
-Copyright (c) 2021 Couchcoding
+Copyright (c) 2022 Couchcoding
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -140,4 +140,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.</value>
   </data>
-</root>
+</root>
diff --git a/src/Logbert/Dialogs/FrmOptions.cs b/src/Logbert/Dialogs/FrmOptions.cs
@@ -95,9 +95,11 @@ private void LstSettingsSelectedIndexChanged(object sender, System.EventArgs e)
         {
           // Show the new option panel control.
           pnlOptionPanel.Controls.Add((Control)lstSettings.SelectedItem);
-          pnlOptionPanel.AutoScrollMinSize = pnlOptionPanel.Controls[0].MinimumSize;
-          grpSettings.Text       = ((IOptionPanel)lstSettings.SelectedItem).PanelName;
-          grpSettings.GroupImage = ((IOptionPanel)lstSettings.SelectedItem).Image;
+
+          pnlOptionPanel.AutoScrollMinSize  = pnlOptionPanel.Controls[0].MinimumSize;
+          pnlOptionPanel.AutoScrollPosition = new Point(0, 0);
+          grpSettings.Text                  = ((IOptionPanel)lstSettings.SelectedItem).PanelName;
+          grpSettings.GroupImage            = ((IOptionPanel)lstSettings.SelectedItem).Image;
 
           // Initialize the new option panel control.
           ((IOptionPanel)lstSettings.SelectedItem).AdjustSizeAndLocation(grpSettings);

diff --git a/src/Logbert/Logbert.csproj b/src/Logbert/Logbert.csproj
@@ -573,6 +573,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Dialogs\FrmAbout.resx">
       <DependentUpon>FrmAbout.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Dialogs\FrmNew.resx">
       <DependentUpon>FrmNew.cs</DependentUpon>

diff --git a/src/Logbert/Properties/AssemblyInfo.cs b/src/Logbert/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Couchcoding")]
 [assembly: AssemblyProduct("Logbert")]
-[assembly: AssemblyCopyright("Copyright © 2021 Couchcoding")]
+[assembly: AssemblyCopyright("Copyright © 2022 Couchcoding")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,6 +29,6 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.6.3.1")]
-[assembly: AssemblyFileVersion("1.6.3.1")]
+[assembly: AssemblyVersion("1.6.3.2")]
+[assembly: AssemblyFileVersion("1.6.3.2")]
 [assembly: NeutralResourcesLanguageAttribute("")]
diff --git a/src/Logbert/Properties/Resources.Designer.cs b/src/Logbert/Properties/Resources.Designer.cs
diff --git a/src/Logbert/Properties/Resources.resx b/src/Logbert/Properties/Resources.resx
@@ -125,7 +125,7 @@
     <value>..\Resources\action_add_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="strAboutDlgCopyright" xml:space="preserve">
-    <value>Copyright 2021 Couchcoding. All Right Reserved.</value>
+    <value>Copyright 2022 Couchcoding. All Right Reserved.</value>
   </data>
   <data name="strColumnizerConfigurationEnterColumnNameAndExpression" xml:space="preserve">
     <value>Please enter a name and an expression for each configure column.</value>