From 6155da0bc9e7faa97612d15def98dd68ea2557cd Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 18 Oct 2019 11:30:10 -0700
Subject: Small tuple based fixes

---
 src/WixToolset.Core/Compiler_UI.cs | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

(limited to 'src/WixToolset.Core/Compiler_UI.cs')

diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs
index 6b933d09..30bb7ab6 100644
--- a/src/WixToolset.Core/Compiler_UI.cs
+++ b/src/WixToolset.Core/Compiler_UI.cs
@@ -746,7 +746,9 @@ namespace WixToolset.Core
         {
             var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
             Identifier id = null;
-            var color = CompilerConstants.IntegerNotSet;
+            int? red = null;
+            int? green = null;
+            int? blue = null;
             var bold = false;
             var italic = false;
             var strike = false;
@@ -769,42 +771,21 @@ namespace WixToolset.Core
                         var redColor = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Byte.MaxValue);
                         if (CompilerConstants.IllegalInteger != redColor)
                         {
-                            if (CompilerConstants.IntegerNotSet == color)
-                            {
-                                color = redColor;
-                            }
-                            else
-                            {
-                                color += redColor;
-                            }
+                            red = redColor;
                         }
                         break;
                     case "Green":
                         var greenColor = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Byte.MaxValue);
                         if (CompilerConstants.IllegalInteger != greenColor)
                         {
-                            if (CompilerConstants.IntegerNotSet == color)
-                            {
-                                color = greenColor * 256;
-                            }
-                            else
-                            {
-                                color += greenColor * 256;
-                            }
+                            green = greenColor;
                         }
                         break;
                     case "Blue":
                         var blueColor = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Byte.MaxValue);
                         if (CompilerConstants.IllegalInteger != blueColor)
                         {
-                            if (CompilerConstants.IntegerNotSet == color)
-                            {
-                                color = blueColor * 65536;
-                            }
-                            else
-                            {
-                                color += blueColor * 65536;
-                            }
+                            blue = blueColor;
                         }
                         break;
 
@@ -843,7 +824,7 @@ namespace WixToolset.Core
 
             if (null == id)
             {
-                this.Core.CreateIdentifier("txs", faceName, size.ToString(), color.ToString(), bold.ToString(), italic.ToString(), strike.ToString(), underline.ToString());
+                this.Core.CreateIdentifier("txs", faceName, size.ToString(), (red ?? 0).ToString(), (green ?? 0).ToString(), (blue ?? 0).ToString(), bold.ToString(), italic.ToString(), strike.ToString(), underline.ToString());
             }
 
             if (null == faceName)
@@ -858,7 +839,9 @@ namespace WixToolset.Core
                 var tuple = new TextStyleTuple(sourceLineNumbers, id)
                 {
                     FaceName = faceName,
-                    Color = color,
+                    Red = red,
+                    Green = green,
+                    Blue = blue,
                     Bold = bold,
                     Italic = italic,
                     Strike = strike,
-- 
cgit v1.2.3-55-g6feb