Major Changes

Taiizor · Nov 29, 2024 · 951f4c4 · 951f4c4
1 parent 1dd1aa4
commit 951f4c4
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 9 deletions.
diff --git a/demo/ReaLTaiizor.UI/ReaLTaiizor.UI/ReaLTaiizor.UI.csproj b/demo/ReaLTaiizor.UI/ReaLTaiizor.UI/ReaLTaiizor.UI.csproj
@@ -85,10 +85,10 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <!--<PackageReference Include="ReaLTaiizor" Version="3.8.0.8" />-->
-        <Reference Include="ReaLTaiizor">
+        <PackageReference Include="ReaLTaiizor" Version="3.8.0.8" />
+        <!--<Reference Include="ReaLTaiizor">
             <HintPath>..\..\..\src\ReaLTaiizor\bin\Release\$(TargetFramework)\ReaLTaiizor.dll</HintPath>
-        </Reference>
+        </Reference>-->
     </ItemGroup>
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='GitHub|AnyCPU'">
         <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>

diff --git a/src/ReaLTaiizor/Colors/Material.cs b/src/ReaLTaiizor/Colors/Material.cs
@@ -12,12 +12,12 @@ namespace ReaLTaiizor.Colors
 
     public class MaterialColorScheme
     {
-        public readonly Color PrimaryColor, DarkPrimaryColor, LightPrimaryColor, AccentColor, TextColor;
-
         public readonly Pen PrimaryPen, DarkPrimaryPen, LightPrimaryPen, AccentPen, TextPen;
 
         public readonly Brush PrimaryBrush, DarkPrimaryBrush, LightPrimaryBrush, AccentBrush, TextBrush;
 
+        public readonly Color PrimaryColor, DarkPrimaryColor, LightPrimaryColor, AccentColor, TextColor;
+
         public MaterialColorScheme() : this(MaterialPrimary.Indigo500, MaterialPrimary.Indigo700, MaterialPrimary.Indigo100, MaterialAccent.Pink200, MaterialTextShade.WHITE)
         {
         }

diff --git a/src/ReaLTaiizor/Controls/Drawer/MaterialDrawer.cs b/src/ReaLTaiizor/Controls/Drawer/MaterialDrawer.cs
@@ -82,6 +82,23 @@ public bool UseColors
             }
         }
 
+        [Category("Drawer")]
+        private bool _usePreProcessIcons;
+
+        public bool UsePreProcessIcons
+        {
+            get
+            {
+                return _usePreProcessIcons;
+            }
+            set
+            {
+                _usePreProcessIcons = value;
+                preProcessIcons();
+                Invalidate();
+            }
+        }
+
         [Category("Drawer")]
         private bool _highlightWithAccent;
 
@@ -293,8 +310,27 @@ private void preProcessIcons()
                     new float[] {   0,   0,   0,   1,  0}, // alpha scale factor
                     new float[] {   r,   g,   b,   0,  1}};// offset
 
-            ColorMatrix colorMatrixGray = new(matrixGray);
-            ColorMatrix colorMatrixColor = new(matrixColor);
+            // Create matrices
+            float[][] matrixStandard = {
+                    new float[] {   1,   0,   0,   0,  0}, // Red scale factor
+                    new float[] {   0,   1,   0,   0,  0}, // Green scale factor
+                    new float[] {   0,   0,   1,   0,  0}, // Blue scale factor
+                    new float[] {   0,   0,   0,   1,  0}, // alpha scale factor
+                    new float[] {   0,   0,   0,   0,  0}};// offset
+
+            ColorMatrix colorMatrixGray = new();
+            ColorMatrix colorMatrixColor = new();
+
+            if (_usePreProcessIcons)
+            {
+                colorMatrixGray = new ColorMatrix(matrixGray);
+                colorMatrixColor = new ColorMatrix(matrixColor);
+            }
+            else
+            {
+                colorMatrixGray = new ColorMatrix(matrixStandard);
+                colorMatrixColor = new ColorMatrix(matrixStandard);
+            }
 
             ImageAttributes grayImageAttributes = new();
             ImageAttributes colorImageAttributes = new();

diff --git a/src/ReaLTaiizor/Controls/ListBox/MaterialListBox.cs b/src/ReaLTaiizor/Controls/ListBox/MaterialListBox.cs
@@ -441,7 +441,7 @@ protected override void OnPaint(PaintEventArgs e)
                 string itemText = Items[i].Text;
                 string itemSecondaryText = Items[i].SecondaryText;
 
-                Rectangle itemRect = new Rectangle(0, (i - firstItem) * _itemHeight - itemOffset, Width - (_showScrollBar && _scrollBar.Visible ? _scrollBar.Width : 0), _itemHeight);
+                Rectangle itemRect = new(0, (i - firstItem) * _itemHeight - itemOffset, Width - (_showScrollBar && _scrollBar.Visible ? _scrollBar.Width : 0), _itemHeight);
 
                 if (MultiSelect && _indicates.Count != 0)
                 {

diff --git a/src/ReaLTaiizor/Forms/Form/MaterialFlexibleForm.cs b/src/ReaLTaiizor/Forms/Form/MaterialFlexibleForm.cs
@@ -119,7 +119,7 @@ private void InitializeComponent()
             this.richTextBoxMessage.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.richTextBoxMessage.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.MaterialFlexibleFormBindingSource, "MessageText", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.richTextBoxMessage.Depth = 0;
-            this.richTextBoxMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, (byte)0);
+            this.richTextBoxMessage.Font = new System.Drawing.Font("Roboto", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, (byte)0);
             this.richTextBoxMessage.ForeColor = System.Drawing.Color.FromArgb((int)(byte)222, (int)(byte)0, (int)(byte)0, (int)(byte)0);
             this.richTextBoxMessage.Location = new System.Drawing.Point(56, 12);
             this.richTextBoxMessage.Margin = new System.Windows.Forms.Padding(0);

diff --git a/src/ReaLTaiizor/Forms/Form/MaterialForm.cs b/src/ReaLTaiizor/Forms/Form/MaterialForm.cs
@@ -147,6 +147,23 @@ public bool DrawerUseColors
             }
         }
 
+        [Category("Drawer")]
+        public bool DrawerUsePreProcessIcons
+        {
+            get => _drawerUsePreProcessIcons;
+            set
+            {
+                if (_drawerUsePreProcessIcons == value) return;
+
+                _drawerUsePreProcessIcons = value;
+
+                if (drawerControl == null) return;
+
+                drawerControl.UsePreProcessIcons = value;
+                drawerControl.Refresh();
+            }
+        }
+
         [Category("Drawer")]
         public bool DrawerHighlightWithAccent
         {
@@ -435,6 +452,7 @@ private bool Maximized
         private bool _drawerAutoShow;
         private bool _drawerIsOpen;
         private bool _drawerUseColors;
+        private bool _drawerUsePreProcessIcons;
         private bool _drawerHighlightWithAccent;
         private bool _backgroundWithAccent;
         private MaterialDrawer drawerControl = new();
@@ -452,6 +470,7 @@ public MaterialForm()
             DrawerAutoHide = true;
             DrawerAutoShow = false;
             DrawerIndicatorWidth = 0;
+            DrawerUsePreProcessIcons = true;
             DrawerHighlightWithAccent = true;
             DrawerShowIconsWhenHidden = false;
             DrawerBackgroundWithAccent = false;