put console attributes in own variable

shliujing · Apr 2, 2019 · 2661fbe · 2661fbe
1 parent a247624
commit 2661fbe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/tools/ColorTool/ColorTool/IniSchemeParser.cs b/tools/ColorTool/ColorTool/IniSchemeParser.cs
@@ -154,7 +154,8 @@ public ColorScheme ParseScheme(string schemeName, bool reportErrors = false)
 
             if (colorTable != null)
             {
-                return new ColorScheme { colorTable = colorTable, consoleAttributes = new ConsoleAttributes { background = backgroundColor, foreground = foregroundColor, popupBackground = popupBackgroundColor, popupForeground = popupForegroundColor } };
+                var consoleAttributes = new ConsoleAttributes { background = backgroundColor, foreground = foregroundColor, popupBackground = popupBackgroundColor, popupForeground = popupForegroundColor };
+                return new ColorScheme { colorTable = colorTable, consoleAttributes = consoleAttributes };
             }
             else
             {

diff --git a/tools/ColorTool/ColorTool/JsonParser.cs b/tools/ColorTool/ColorTool/JsonParser.cs
@@ -116,7 +116,8 @@ public ColorScheme ParseScheme(string schemeName, bool reportErrors = false)
                     }
                 }
 
-                return new ColorScheme { colorTable = colorTable, consoleAttributes = new ConsoleAttributes { background = screenBackground, foreground = screenForeground, popupBackground = popupBackground, popupForeground = popupForeground } };
+                var consoleAttributes = new ConsoleAttributes { background = screenBackground, foreground = screenForeground, popupBackground = popupBackground, popupForeground = popupForeground };
+                return new ColorScheme { colorTable = colorTable, consoleAttributes = consoleAttributes };
             }
             catch (Exception /*e*/)
             {

diff --git a/tools/ColorTool/ColorTool/XmlSchemeParser.cs b/tools/ColorTool/ColorTool/XmlSchemeParser.cs
@@ -135,7 +135,8 @@ public ColorScheme ParseScheme(string schemeName, bool reportErrors = false)
                 return null;
             }
 
-            return new ColorScheme { colorTable = colorTable, consoleAttributes = new ConsoleAttributes { foreground = fgColor, background = bgColor } };
+            var consoleAttributes = new ConsoleAttributes { foreground = fgColor, background = bgColor };
+            return new ColorScheme { colorTable = colorTable, consoleAttributes = consoleAttributes };
         }
     }
 }