v4.2.0 - Preview-4.3

Refined calendar symbols
FRACerqueira · Oct 25, 2023 · d25816d · d25816d
2 parents 623fbfe + f8c03d3
commit d25816d
Showing 1 changed file with 11 additions and 22 deletions.
diff --git a/Src/Controls/Calendar/CalendarControl.cs b/Src/Controls/Calendar/CalendarControl.cs
@@ -1576,39 +1576,28 @@ private void WriteDay(ScreenBuffer screenBuffer, DateTime auxdate)
             }
             else if (auxdate == _currentdate)
             {
-                if (IsHighlight(auxdate))
+                if (IsHighlight(auxdate) && strnote != "*")
                 {
-                    if (strnote == "*")
-                    {
-                        screenBuffer.AddBuffer($"#{strnote}{cday}#", _options.StyleContent(StyleControls.Selected));
-                    }
-                    else
-                    {
-                        screenBuffer.AddBuffer($" #{cday}#", _options.StyleContent(StyleControls.Selected));
-                    }
+                    strnote = "#";
+                }
+                if (strnote.Trim().Length != 0)
+                {
+                    screenBuffer.AddBuffer($"<{strnote}{cday}>", _options.StyleContent(StyleControls.Selected));
                 }
                 else
                 {
-                    if (strnote == "*")
-                    {
-                        screenBuffer.AddBuffer($"<{strnote}{cday}>", _options.StyleContent(StyleControls.Selected));
-                    }
-                    else
-                    {
-                        screenBuffer.AddBuffer($" <{cday}>", _options.StyleContent(StyleControls.Selected));
-                    }
+                    screenBuffer.AddBuffer($" <{cday}>", _options.StyleContent(StyleControls.Selected));
                 }
             }
             else
             {
+                var stl = StyleControls.CalendarDay;
                 if (IsHighlight(auxdate))
                 {
-                    screenBuffer.AddBuffer($" {strnote}{cday}#", _options.StyleContent(StyleControls.CalendarHighlight));
-                }
-                else
-                {
-                    screenBuffer.AddBuffer($" {strnote}{cday} ", _options.StyleContent(StyleControls.CalendarDay));
+                    strnote = "#";
+                    stl = StyleControls.CalendarHighlight;
                 }
+                screenBuffer.AddBuffer($" {strnote}{cday} ", _options.StyleContent(stl));
             }
         }