More simple bug fixes

- Fix #17 - Fix an issue with the UI scaling / stretching in the profile tab - Version bump
FromDarkHell · Nov 18, 2021 · 5abcc2f · 5abcc2f
1 parent 40fd6d0
commit 5abcc2f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/BL3SaveEditor/AutoUpdater.xml b/BL3SaveEditor/AutoUpdater.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <item>
-  <version>1.1.1.0</version>
+  <version>1.1.2.0</version>
   <url>https://github.com/FromDarkHell/BL3SaveEditor/releases/latest/download/BL3SaveEditor-Portable.zip</url>
   <changelog>https://github.com/FromDarkHell/BL3SaveEditor/releases/latest</changelog>
   <mandatory>false</mandatory>

diff --git a/BL3SaveEditor/Helpers/Helpers.cs b/BL3SaveEditor/Helpers/Helpers.cs
@@ -146,6 +146,8 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
 
             if (value != null) {
                 CustomPlayerColorSaveGameData colorData = (CustomPlayerColorSaveGameData)value;
+                if (colorData.UseDefaultColor || colorData.UseDefaultSplitColor) 
+                    return Color.FromArgb(0, 0, 0, 0);
                 byte r = System.Convert.ToByte(colorData.AppliedColor.X * 255);
                 byte g = System.Convert.ToByte(colorData.AppliedColor.Y * 255);
                 byte b = System.Convert.ToByte(colorData.AppliedColor.Z * 255);
@@ -170,8 +172,8 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
                     ColorParameter = System.Convert.ToString(parameter),
                     AppliedColor = vecClr,
                     SplitColor = vecClr,
-                    UseDefaultColor = false,
-                    UseDefaultSplitColor = false
+                    UseDefaultColor = clr.A < 255,
+                    UseDefaultSplitColor = clr.A < 255
                 };
 
                 return colorData;

diff --git a/BL3SaveEditor/MainWindow.xaml b/BL3SaveEditor/MainWindow.xaml
@@ -235,7 +235,7 @@
                             <Label FontWeight="Normal" Content="Color 1: " VerticalAlignment="Top"
                                     VerticalContentAlignment="Center" HorizontalContentAlignment="Left"
                                     Margin="11,98,0,0" HorizontalAlignment="Left" Width="55" Height="22" />
-                            <xctk:ColorPicker VerticalAlignment="Top" UsingAlphaChannel="False"
+                            <xctk:ColorPicker VerticalAlignment="Top" UsingAlphaChannel="True"
                                     ToolTip="Sadly BL3 doesn't support RGB for colors; It will be converted to what BL3 considers the closest color."
                                     Margin="155,98,0,0" RenderTransformOrigin="0.455,0.826"
                                     IsEnabled="{Binding bSaveLoaded}"
@@ -247,13 +247,13 @@
                             <Label FontWeight="Normal" VerticalAlignment="Top" Content="Color 3: "
                                     VerticalContentAlignment="Center" HorizontalContentAlignment="Left"
                                     Margin="11,151,0,0" HorizontalAlignment="Left" Width="55" Height="22" />
-                            <xctk:ColorPicker VerticalAlignment="Top" UsingAlphaChannel="False"
+                            <xctk:ColorPicker VerticalAlignment="Top" UsingAlphaChannel="True"
                                     ToolTip="Sadly BL3 doesn't support RGB for colors; It will be converted to what BL3 considers the closest color."
                                     Margin="155,125,0,0" RenderTransformOrigin="0.455,0.826"
                                     IsEnabled="{Binding bSaveLoaded}"
-                                    SelectedColor="{Binding saveGame.Character.SelectedColorCustomizations[0], ConverterParameter=*Color_Secondary1, Converter={StaticResource CustomPlayerColorToColorConverter1}, Mode=TwoWay}"
+                                    SelectedColor="{Binding saveGame.Character.SelectedColorCustomizations[1], ConverterParameter=*Color_Secondary1, Converter={StaticResource CustomPlayerColorToColorConverter1}, Mode=TwoWay}"
                                     HorizontalAlignment="Left" Width="271" />
-                            <xctk:ColorPicker VerticalAlignment="Top" UsingAlphaChannel="False"
+                            <xctk:ColorPicker VerticalAlignment="Top" UsingAlphaChannel="True"
                                     ToolTip="Sadly BL3 doesn't support RGB for colors; It will be converted to what BL3 considers the closest color."
                                     Margin="155,151,0,0" RenderTransformOrigin="0.455,0.826"
                                     IsEnabled="{Binding bSaveLoaded}"
@@ -907,10 +907,10 @@
                             HorizontalAlignment="Right" Margin="0,294,10,0" VerticalAlignment="Top"
                             ToolTip="Amount of diamond keys for your profile" Width="254" />
                     <Label FontWeight="Normal" Content="Platform:" HorizontalAlignment="Right" VerticalAlignment="Top"
-                            Width="99" Height="26" VerticalContentAlignment="Center" Margin="0,5,310,0" />
+                            Width="61" Height="26" VerticalContentAlignment="Center" Margin="0,5,348,0" />
                     <ComboBox ItemsSource="{Binding Source={StaticResource PlatformDataSource}}"
-                            SelectedValue="{Binding Path=profile.Platform}" Margin="539,7,10,0" VerticalAlignment="Top"
-                            Height="26" HorizontalAlignment="Stretch" />
+                            SelectedValue="{Binding Path=profile.Platform}" Margin="0,7,10,0" VerticalAlignment="Top"
+                            Height="26" HorizontalAlignment="Right" Width="254" />
                 </Grid>
             </TabItem>
             <TabItem HorizontalAlignment="Left">

diff --git a/BL3SaveEditor/Properties/AssemblyInfo.cs b/BL3SaveEditor/Properties/AssemblyInfo.cs
@@ -51,6 +51,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.1.0")]
-[assembly: AssemblyFileVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.1.2.0")]
+[assembly: AssemblyFileVersion("1.1.2.0")]
 [assembly: NeutralResourcesLanguage("en-US")]