imp - Fixed rendering issues

We've fixed rendering issues. --- Rendering issues for some of the boot styles have been fixed. --- Type: imp Breaking: False Doc Required: False Part: 1/1
Aptivi-Archives · Aug 8, 2023 · dd21a8f · dd21a8f
1 parent 3589709
commit dd21a8f
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -360,4 +360,7 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+
+# Vim swap
+*.swp
diff --git a/GRILO.Bootloader/BootStyle/Styles/BootMgrBootStyle.cs b/GRILO.Bootloader/BootStyle/Styles/BootMgrBootStyle.cs
@@ -91,7 +91,7 @@ public override void RenderHighlight(int chosenBootEntry)
             }
         }
 
-        public override void RenderModalDialog(string content)
+        public override void RenderBootFailedMessage(string content)
         {
             // Render the header and footer
             int marginX = 2;
@@ -127,8 +127,8 @@ public override void RenderModalDialog(string content)
 
         public override void RenderBootingMessage(string chosenBootName) { }
 
-        public override void RenderBootFailedMessage(string content) =>
-            RenderModalDialog(content);
+        public override void RenderModalDialog(string content) =>
+            TextWriterColor.Write(content);
 
         public override void RenderSelectTimeout(int timeout)
         {

diff --git a/GRILO.Bootloader/BootStyle/Styles/DefaultBootStyle.cs b/GRILO.Bootloader/BootStyle/Styles/DefaultBootStyle.cs
@@ -40,7 +40,7 @@ public override void Render()
         {
             // Populate colors
             ConsoleColor sectionTitle = ConsoleColor.Green;
-            ConsoleColor boxBorderColor = ConsoleColor.DarkGray;
+            ConsoleColor boxBorderColor = ConsoleColor.Gray;
 
             // Write the section title
             string finalRenderedSection = "-- Select boot entry --";
@@ -93,7 +93,7 @@ public override void RenderModalDialog(string content)
         {
             // Populate colors
             ConsoleColor dialogBG = ConsoleColor.Black;
-            ConsoleColor dialogFG = ConsoleColor.DarkGray;
+            ConsoleColor dialogFG = ConsoleColor.Gray;
             InfoBoxColor.WriteInfoBox(content, new Color(dialogFG), new Color(dialogBG));
             Console.Clear();
         }

diff --git a/GRILO.Bootloader/BootStyle/Styles/GrubBootStyle.cs b/GRILO.Bootloader/BootStyle/Styles/GrubBootStyle.cs
@@ -91,9 +91,8 @@ public override void RenderHighlight(int chosenBootEntry)
         public override void RenderModalDialog(string content)
         {
             // Populate colors
-            ConsoleColor dialogBG = ConsoleColor.Black;
-            ConsoleColor dialogFG = ConsoleColor.DarkGray;
-            TextWriterColor.Write(content, true, new Color(dialogFG), new Color(dialogBG));
+            ConsoleColor dialogFG = ConsoleColor.Gray;
+            TextWriterColor.Write(content, true, new Color(dialogFG));
         }
 
         public override void RenderBootingMessage(string chosenBootName) { }

diff --git a/GRILO.Bootloader/BootStyle/Styles/GrubLegacyBootStyle.cs b/GRILO.Bootloader/BootStyle/Styles/GrubLegacyBootStyle.cs
@@ -91,9 +91,9 @@ public override void RenderHighlight(int chosenBootEntry)
         public override void RenderModalDialog(string content)
         {
             // Populate colors
-            ConsoleColor dialogBG = ConsoleColor.Black;
-            ConsoleColor dialogFG = ConsoleColor.DarkGray;
-            TextWriterColor.Write(content, true, new Color(dialogFG), new Color(dialogBG));
+            ColorTools.LoadBack(0);
+            ConsoleColor dialogFG = ConsoleColor.Gray;
+            TextWriterColor.Write(content, true, new Color(dialogFG));
         }
 
         public override void RenderBootingMessage(string chosenBootName) =>

diff --git a/GRILO.Bootloader/BootStyle/Styles/LiloBootStyle.cs b/GRILO.Bootloader/BootStyle/Styles/LiloBootStyle.cs
@@ -131,16 +131,12 @@ public override void RenderHighlight(int chosenBootEntry)
         public override void RenderModalDialog(string content)
         {
             // Populate colors
-            ConsoleColor dialogBG = ConsoleColor.Black;
-            ConsoleColor dialogFG = ConsoleColor.DarkGray;
-            TextWriterColor.Write(content, true, new Color(dialogFG), new Color(dialogBG));
+            ColorTools.LoadBack(0);
+            ConsoleColor dialogFG = ConsoleColor.Gray;
+            TextWriterColor.Write(content, true, new Color(dialogFG));
         }
 
-        public override void RenderBootingMessage(string chosenBootName) =>
-            TextWriterColor.Write(
-                $"  Booting '{chosenBootName}'\n\n" +
-                $" Filesystem type is fat, partition type 0x0C"
-            );
+        public override void RenderBootingMessage(string chosenBootName) { }
 
         public override void RenderBootFailedMessage(string content) =>
             RenderModalDialog(content);

diff --git a/GRILO.Bootloader/BootStyle/Styles/NtldrBootStyle.cs b/GRILO.Bootloader/BootStyle/Styles/NtldrBootStyle.cs
@@ -67,14 +67,16 @@ public override void RenderHighlight(int chosenBootEntry)
         public override void RenderModalDialog(string content)
         {
             // Populate colors
+            ColorTools.LoadBack(0);
             ConsoleColor highlightedEntryForeground = ConsoleColor.Black;
             ConsoleColor highlightedEntryBackground = ConsoleColor.Gray;
 
             TextWriterColor.Write($"""
 
                 {content}
+
                 """);
-            TextWriterColor.Write("    Continue", new Color(highlightedEntryForeground), new Color(highlightedEntryBackground));
+            TextWriterColor.Write("    Continue", true, new Color(highlightedEntryForeground), new Color(highlightedEntryBackground));
             TextWriterColor.Write("\nUse the up and down arrow keys to move the highlight to your choice.");
         }
 

diff --git a/GRILO.Bootloader/BootStyle/Styles/StandardBootStyle.cs b/GRILO.Bootloader/BootStyle/Styles/StandardBootStyle.cs
@@ -68,7 +68,7 @@ public override void RenderModalDialog(string content)
         {
             // Populate colors
             ConsoleColor dialogBG = ConsoleColor.Black;
-            ConsoleColor dialogFG = ConsoleColor.DarkGray;
+            ConsoleColor dialogFG = ConsoleColor.Gray;
             InfoBoxColor.WriteInfoBox(content, new Color(dialogFG), new Color(dialogBG));
             Console.Clear();
         }