fix valid data path tick

anno-mods · Jun 11, 2022 · e6ef8bb · e6ef8bb
1 parent 53c04f3
commit e6ef8bb
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/AnnoMapEditor/MainWindow.xaml b/AnnoMapEditor/MainWindow.xaml
@@ -4,6 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:controls="clr-namespace:AnnoMapEditor.Controls"
+        xmlns:utils="clr-namespace:AnnoMapEditor.Utils"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800"
         Background="#182B3F">
@@ -51,6 +52,7 @@
             <Setter Property="Width" Value="auto" />
             <Setter Property="Padding" Value="2,6,2,6" />
         </Style>
+        <utils:BooleanToVisibilityConverter x:Key="VisibleOnTrue" />
     </Window.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
@@ -63,7 +65,7 @@
             <Button Click="Configure_Click" Style="{StaticResource DefaultButtonStyle}" Width="200" HorizontalAlignment="Left">Set RDA path...</Button>
             <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
                 <TextBlock Style="{StaticResource DefaultLabelStyle}" Text="{Binding Settings.DataPath, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-                <TextBlock Style="{StaticResource DefaultLabelStyle}" Text="✔" Visibility="{Binding Settings.IsValidDataPath, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
+                <TextBlock Style="{StaticResource DefaultLabelStyle}" Text="✔" Visibility="{Binding Settings.IsValidDataPath, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource VisibleOnTrue}}" />
             </StackPanel>
         </StackPanel>
     </Grid>

diff --git a/AnnoMapEditor/MainWindow.xaml.cs b/AnnoMapEditor/MainWindow.xaml.cs
@@ -44,7 +44,7 @@ private async void OpenFile_Click(object sender, RoutedEventArgs e)
 
             if (true == picker.ShowDialog())
             {
-                if (string.IsNullOrEmpty(Settings.Instance.DataPath))
+                if (!Settings.Instance.IsValidDataPath)
                 {
                     int end = picker.FileName.IndexOf(@"\data\session");
                     if (end == -1)

diff --git a/AnnoMapEditor/Utils/BooleanToVisibilityConverter.cs b/AnnoMapEditor/Utils/BooleanToVisibilityConverter.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace AnnoMapEditor.Utils
+{
+    [ValueConversion(typeof(bool), typeof(Visibility))]
+    public sealed class BooleanToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType,
+            object parameter, CultureInfo culture)
+        {
+            return (value is bool b && b) ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType,
+            object parameter, CultureInfo culture)
+        {
+            return Equals(value, Visibility.Visible);
+        }
+    }
+}
diff --git a/AnnoMapEditor/Utils/Settings.cs b/AnnoMapEditor/Utils/Settings.cs
@@ -24,7 +24,7 @@ public string? DataPath
                 }
             }
         }
-        private string? _dataPath = UserSettings.Default.DataPath;
+        private string? _dataPath;
 
         public bool IsValidDataPath
         {
@@ -33,6 +33,11 @@ public bool IsValidDataPath
         }
         private bool _isValidDataPath = false;
 
+        public Settings()
+        {
+            DataPath = UserSettings.Default.DataPath;
+        }
+
         private static string? CorrectDataPath(string? path)
         {
             if (path is null)