From 67d3bdadfe380e58d78812b0683ecbf13dcc64a7 Mon Sep 17 00:00:00 2001
From: Joel Bennett <Jaykul@HuddledMasses.org>
Date: Thu, 31 Oct 2024 01:59:06 -0400
Subject: [PATCH] Tweak color formatting

---
 Source/Pansies.format.ps1xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Source/Pansies.format.ps1xml b/Source/Pansies.format.ps1xml
index d157668..13e418c 100644
--- a/Source/Pansies.format.ps1xml
+++ b/Source/Pansies.format.ps1xml
@@ -77,15 +77,15 @@ This is Joel "Jaykul" Bennett's coloring format file for PowerShell 5.1
       </ViewSelectedBy>
       <TableControl>
         <TableHeaders>
-          <TableColumnHeader>
-            <Width>14</Width> <!-- LightGoldenrodYellow? -->
-            <Label>Mode</Label>
-          </TableColumnHeader>
           <TableColumnHeader>
             <Width>9</Width>
             <Alignment>Left</Alignment>
             <Label>RGB (hex)</Label>
           </TableColumnHeader>
+          <TableColumnHeader>
+            <Width>12</Width> <!-- ConsoleColor | X11 | XTerm256 -->
+            <Label>Mode</Label>
+          </TableColumnHeader>
           <TableColumnHeader>
             <Width>20</Width>
             <Alignment>Left</Alignment>
@@ -113,11 +113,13 @@ This is Joel "Jaykul" Bennett's coloring format file for PowerShell 5.1
               <TableColumnItem>
                 <ScriptBlock>
                   ([PoshCode.Pansies.RgbColor]$_).ToVtEscapeSequence($true) + " $([char]27)[0m " +
-                  $(if ($_ -is [PoshCode.Pansies.RgbColor]) { $_.Mode } else { $_.GetType().Name })
+                  ("#{0:X6}" -f ([PoshCode.Pansies.RgbColor]$_).RGB)
                 </ScriptBlock>
               </TableColumnItem>
               <TableColumnItem>
-                <ScriptBlock>"#{0:X6}" -f ([PoshCode.Pansies.RgbColor]$_).RGB</ScriptBlock>
+                <ScriptBlock>
+                  if ($_ -is [PoshCode.Pansies.RgbColor]) { $_.Mode } else { $_.GetType().Name }
+                </ScriptBlock>
               </TableColumnItem>
               <TableColumnItem>
                 <ScriptBlock>([PoshCode.Pansies.RgbColor]$_).X11ColorName</ScriptBlock>
@@ -154,4 +156,4 @@ This is Joel "Jaykul" Bennett's coloring format file for PowerShell 5.1
       </WideControl>
     </View>
   </ViewDefinitions>
-</Configuration>
\ No newline at end of file
+</Configuration>