From 6fcfe0c819827d139a30d9ab78c099be9893608f Mon Sep 17 00:00:00 2001
From: Yoshi Askharoun <jjask7@gmail.com>
Date: Wed, 27 Oct 2021 14:09:51 -0500
Subject: [PATCH] Improved decomp error debugging

---
 .../ZuneUIXTools.ViewModels.csproj            |   2 +-
 ZuneUIXTools/MainWindow.xaml.cs               |  10 +-
 ZuneUIXTools/ZuneUIXTools.csproj              |   4 +-
 test/testA.decomp.uix                         |  12 ++-
 test/text.decomp.uix                          | 102 +++++++++++++++++-
 test/text.uib                                 | Bin 2235 -> 2354 bytes
 test/text.uix                                 |   9 +-
 7 files changed, 131 insertions(+), 8 deletions(-)

diff --git a/ZuneUIXTools.ViewModels/ZuneUIXTools.ViewModels.csproj b/ZuneUIXTools.ViewModels/ZuneUIXTools.ViewModels.csproj
index 7dd79a7..f4dd354 100644
--- a/ZuneUIXTools.ViewModels/ZuneUIXTools.ViewModels.csproj
+++ b/ZuneUIXTools.ViewModels/ZuneUIXTools.ViewModels.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>preview</LangVersion>
-        <SignAssembly>true</SignAssembly>
+        <SignAssembly>false</SignAssembly>
         <AssemblyOriginatorKeyFile>uixtools.pfx</AssemblyOriginatorKeyFile>
     </PropertyGroup>
 
diff --git a/ZuneUIXTools/MainWindow.xaml.cs b/ZuneUIXTools/MainWindow.xaml.cs
index e9dbe9b..51294da 100644
--- a/ZuneUIXTools/MainWindow.xaml.cs
+++ b/ZuneUIXTools/MainWindow.xaml.cs
@@ -266,7 +266,7 @@ namespace ZuneUIXTools
                 Application.Run();
                 InterpreterContext.UseDecompile = false;
 
-                File.WriteAllText(System.IO.Path.ChangeExtension(compiledFile, ".decomp.uix"), InterpreterContext.DecompileResult.InnerXml);
+                File.WriteAllText(System.IO.Path.ChangeExtension(compiledFile, $".decomp.uix"), InterpreterContext.DecompileResults.Last().InnerXml);
             }
             catch (Exception ex)
             {
@@ -276,6 +276,14 @@ namespace ZuneUIXTools
                         $"Failed to decompile '{compiledFile}'",
                         "Zune UIX Tools", MessageBoxButton.OK, MessageBoxImage.Error
                     );
+                    System.Diagnostics.Debug.WriteLine(ex.ToString());
+
+                    TextBlock errBlock = new TextBlock
+                    {
+                        Text = ex.ToString(),
+                        Margin = new Thickness(0, 0, 0, 4)
+                    };
+                    ErrorPanel.Children.Add(errBlock);
                 });
             }
         }
diff --git a/ZuneUIXTools/ZuneUIXTools.csproj b/ZuneUIXTools/ZuneUIXTools.csproj
index bba5e81..bfd9f49 100644
--- a/ZuneUIXTools/ZuneUIXTools.csproj
+++ b/ZuneUIXTools/ZuneUIXTools.csproj
@@ -5,8 +5,8 @@
         <TargetFramework>net48</TargetFramework>
         <UseWPF>true</UseWPF>
         <ApplicationIcon>Images\VCSIrisProject.ico</ApplicationIcon>
-        <SignAssembly>true</SignAssembly>
-        <AssemblyOriginatorKeyFile>uixtools.pfx</AssemblyOriginatorKeyFile>
+        <!--<SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>uixtools.pfx</AssemblyOriginatorKeyFile>-->
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/test/testA.decomp.uix b/test/testA.decomp.uix
index e0dcda1..0d4b67e 100644
--- a/test/testA.decomp.uix
+++ b/test/testA.decomp.uix
@@ -1 +1,11 @@
-<UI Name="Default"><Content><Text Color="A=255, R=255, G=0, B=0" Content="Howdy from Microsoft.Iris!" /></Content></UI>
\ No newline at end of file
+<UIX xmlns="http://schemas.microsoft.com/2007/uix">
+    <UI Name="Default">
+        <Content>
+            <Text Content="Howdy from Microsoft.Iris!">
+                <Color>
+                    <Color R="255" A="255" />
+                </Color>
+            </Text>
+        </Content>
+    </UI>
+</UIX>
\ No newline at end of file
diff --git a/test/text.decomp.uix b/test/text.decomp.uix
index 34dc37a..10c5c45 100644
--- a/test/text.decomp.uix
+++ b/test/text.decomp.uix
@@ -1 +1,101 @@
-<UI Name="Default" />
\ No newline at end of file
+<UIX xmlns="http://schemas.microsoft.com/2007/uix">
+    <UI Name="Default">
+        <Locals>
+            <Font FontSize="10" AltFontSize="10" FontName="Bahnschrift" Name="SmallFont" />
+            <Font FontName="JetBrains Mono" FontSize="18" FontStyle="Bold, Italic" Name="BigFont" />
+        </Locals>
+        <Content>
+            <Panel>
+                <Layout>
+                    <FlowLayout Orientation="Vertical">
+                        <Spacing>
+                            <MajorMinor Major="50" />
+                        </Spacing>
+                    </FlowLayout>
+                </Layout>
+                <Children>
+                    <Host Name="TextSettings" />
+                    <Host Name="UsingMargins" />
+                    <Host Name="UsingColorfillWithText" />
+                </Children>
+            </Panel>
+        </Content>
+    </UI>
+    <UI Name="TextSettings">
+        <Content>
+            <Panel>
+                <Layout>
+                    <FlowLayout Orientation="Vertical" MinimumSampleSize="3" />
+                </Layout>
+                <MaximumSize>
+                    <Size Width="140" />
+                </MaximumSize>
+                <Children>
+                    <Text MaximumLines="3" WordWrap="True" Content="This large text will wrap.  This sentence won't be displayed because it exceeds the 3 line maximum.">
+                        <HighlightColor>
+                            <Color R="255" G="215" A="255" />
+                        </HighlightColor>
+                        <Font>
+                            <Font FontSize="12" AltFontSize="12" FontName="Bahnschrift" />
+                        </Font>
+                    </Text>
+                </Children>
+            </Panel>
+        </Content>
+    </UI>
+    <UI Name="UsingMargins">
+        <Content>
+            <Panel>
+                <Layout>
+                    <FlowLayout Orientation="Vertical" MinimumSampleSize="3" />
+                </Layout>
+                <Children>
+                    <Text Content="You can use margins to create space between text items:">
+                        <Color>
+                            <Color R="127" G="255" B="212" A="255" />
+                        </Color>
+                        <Font>
+                            <Font FontSize="12" AltFontSize="12" FontName="Bahnschrift" />
+                        </Font>
+                    </Text>
+                    <Text Content="This sentence has a top margin of 20 pixels.">
+                        <Margins>
+                            <Inset Top="20" />
+                        </Margins>
+                        <Color>
+                            <Color R="135" G="206" B="235" A="255" />
+                        </Color>
+                        <Font>
+                            <Font FontSize="12" AltFontSize="12" FontName="Bahnschrift" />
+                        </Font>
+                    </Text>
+                </Children>
+            </Panel>
+        </Content>
+    </UI>
+    <UI Name="UsingColorfillWithText">
+        <Content>
+            <Panel>
+                <Layout>
+                    <FlowLayout Orientation="Vertical" MinimumSampleSize="3" />
+                </Layout>
+                <MinimumSize>
+                    <Size Width="500" Height="40" />
+                </MinimumSize>
+                <Children>
+                    <Text LineAlignment="Center" Content="&lt;b&gt;Gig em&lt;b/&gt;, Ags!">
+                        <Color>
+                            <Color R="128" A="255" />
+                        </Color>
+                        <Font>
+                            <Font FontSize="12" AltFontSize="12" FontName="Bahnschrift" />
+                        </Font>
+                        <NamedStyles>
+                            <Dictionary />
+                        </NamedStyles>
+                    </Text>
+                </Children>
+            </Panel>
+        </Content>
+    </UI>
+</UIX>
\ No newline at end of file
diff --git a/test/text.uib b/test/text.uib
index 8ab2146bf547f072514e8af05ebe7ebdf808efdf..4fbcb3c15b711bac6c3863c54fcbf7ed865e0586 100644
GIT binary patch
delta 826
zcmdljxJgJl)YD1o3o`?QI6DJ_0S5#daWXLc|6e;%T9Z*?qH8zvzyA^w&+2kWGB7YO
zF)>I@W@2n%m0)CGxI9^rQFQVGMu~b+1_lOckTin~n3M&Ratt6K&%nUI#=yhCz`)7C
z2PPF57#P?Y6v5(33=9l{49Z}V4NR(lNmVcj(ksXy3|6TICe^{>;$TvPfq_AsL6(7`
z9%K&#1A`Pp4g&*2F#`ib9RmYHD+2>V4+8_kWCjL?Squye3mF&~RxmIytY=_g*u}uW
zaFBt4;RFK%!+8b<hRX~L47V5<7#=b(FuY)3VE7I403!nfCnE!c2qOc7G$R9p5+ehH
zCL;rb0V4y0IU@rD7Xt$$0|Ns$14F(M)B#KkjG7D#49pCSpul2gVANt@U|<1BPH<!e
ziGwhs6axbT2Lq!v0|SEq#EBpkLJSNH*Z==#Vqnx^U;z1<nSp^pgn@yPnSoK4fq_AY
zf#J&k`v1%fjCzv=nHB2wA=<w%GBAJwLJZ;>kSPoeAXNr1s}DFbGcX!5Fff2zd4_?3
z;VJ_I!(#>phL51wU}Rw6Wn^HGWMp8FXJlYdXJlZ|XJlZoW@KP+Wn^IRVPs$kVPs%P
zU}Rv(Wn^HeWMp8dXJlY#1rgnh3=ESP85m|VGB7M+WMEjy$iT3Jk%8ebBLl-ZMh1rK
zj0_C-85tN}GBPlHW@KRa$H>6I&cwhVz{J2H#l*m%&cwiA&cwjr%EZ9n&&0qG!NkCj
z%EZ7>#KgeR#KgcbiHU(>0TTnmS|$btA!Y^!Z)OIDN@fOzK4u06#%YtqSUz%wq*jy!
zmsIAYPG)6Y#LL~_mzbNH0v0IVyquMtQC7IYCdtk{GhHDy*Ct8dPDjBpy;za00j$Jv
z@*cLovW$!jjN%N65)3>d4E+E9OET~XGw^XR@USqbswzxA#Qsr$jgf(mp@ES>gt38#
I;RX`}0B#Cwd;kCd

delta 673
zcmdlav|CU*)YD1o3o`@59ySJsgX|Ezn}dPj|Nqd5(wdCo6J5L685#cn|Nq});zRL?
zA6Nv07#J9s7#J8NKr|DB<YW%U7DkrIy^MzS!VC-yQXpXlX)q}RCS@5wK#qZdfsKKO
zfq{XOfe%c|GcYi)Gbn(?6&V;91R0dTBpaAi29qja5~Np<0c1KGgDP0P8dzK$WH1;@
zFr+Xr#4%(uFff!cFfi0IFfg<*Ffep8FfdGFU|^WZz`(G8fq`K;0|Ub*1_p+m3=9kh
z7#J9iGcYimW?*2r#K6FClYxQZ0RscWX9fm_UknTkjEoEnJd6ws!i)?IQj81?ij&tf
zNu;PVFfcGPFoHbK%)qF@z`(!)a=-*fR**OdGfFZrFmNz1YBDe|2rw}8fTS517(l^x
z{r`U^21YFg29RHv85kHu7#J9t85p%8@>l-X|7T`k)S0Z!tiY%{*@s!aUXOu+K_BYa
zlMD<D*BKZXo-!~n{DnG@7wSN1Mg|6DMg|6bMg|5;Mg|54Mg|5CMh1ouMh1pNMh1pl
zMh1prMh1pTMh1p@Mh1p9Mh1pnMh1pyj0_BO85tPXFfuS~XJlYFz{tRGf{}sY5+eh{
z9YzK>hUbh73?CR77=AJ`FfcPQFbFU)FeorFFz7KcFjz1#FgP+XF!(VsFvKx2Fyt{Y
zFw`(HFmy68FuY@8U{GgfU<hSqU`U?q#qx2o8|#A2pIO-%`FI-KGt(7Pb9EFP(~A`+
fi?jdb<l|uAVPQ~Jm7i?L@sWdpv4Mx-1``7SW<*+*

diff --git a/test/text.uix b/test/text.uix
index f1d5233..2317b8c 100644
--- a/test/text.uix
+++ b/test/text.uix
@@ -4,7 +4,6 @@
     <UI Name="Default">
         <!-- This UI displays the other UIs. TextDisplay -->
         <Locals>
-
             <Font Name="SmallFont" Font="Bahnschrift,10" />
             <Font Name="BigFont" FontName="JetBrains Mono" FontSize="18" FontStyle="Bold,Italic"/>
         </Locals>
@@ -51,7 +50,13 @@
         <Content>
             <Panel Layout="VerticalFlow" MinimumSize="500,40">
                 <Children>
-                    <Text LineAlignment="Center" Color="Maroon" Font="Bahnschrift" Content="Gig em, Ags!" />
+                    <Text LineAlignment="Center" Color="Maroon" Font="Bahnschrift" Content="&lt;b&gt;Gig em&lt;b/&gt;, Ags!">
+                    	<NamedStyles>
+                    		<TextStyle Name="StyleA">
+                    			<FontSize>24</FontSize>
+                    		</TextStyle>
+                    	</NamedStyles>
+                    </Text>
                 </Children>
             </Panel>
         </Content>