Opening configuration is not allowed when configuration is changed fr…

…om tree view.
Soloplan · May 30, 2019 · 6156573 · 6156573
1 parent cca22a1
commit 6156573
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/Soloplan.WhatsON.GUI/CustomTitleBar.xaml b/src/Soloplan.WhatsON.GUI/CustomTitleBar.xaml
@@ -26,6 +26,7 @@
                                Kind="{Binding CustomButtonIcon}"
                                Visibility="{Binding CustomButtonVisible, Converter={StaticResource BoolToVis}}"
                                MouseDown="OnButtonClicked" />
+      <ContentControl Width="30" Height="30" Visibility="{Binding CustomButtonVisible, Converter={StaticResource InvertBoolToVis}}"/>
 
       <Button Width="30"
               Height="30"

diff --git a/src/Soloplan.WhatsON.GUI/MainWindow.xaml b/src/Soloplan.WhatsON.GUI/MainWindow.xaml
@@ -39,7 +39,7 @@
   <DockPanel>
     <local:CustomTitleBar ButtonClicked="OpenConfig"
                           CustomButtonIcon="SettingsOutline"
-                          CustomButtonVisible="True"
+                          CustomButtonVisible="{Binding ConfigurationModifiedFromTree, RelativeSource={RelativeSource AncestorType={x:Type local:MainWindow}}, Converter={StaticResource InvertBoolConverter}}"
                           DockPanel.Dock="Top"
                           ShowMinimizeButton="{Binding Path=ShowInTaskbar, RelativeSource={RelativeSource AncestorType={x:Type local:MainWindow}}}"
                           Window="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:MainWindow}}}" />
@@ -95,7 +95,7 @@
                  FontSize="18"
                  FontWeight="Bold"
                  Text="Loading..."
-                 Visibility="{Binding IsTreeNotInitialized, Converter={StaticResource BoolToVis}}" />
+                 Visibility="{Binding IsTreeInitialized, Converter={StaticResource InvertBoolToVis}}" />
     </Grid>
   </DockPanel>
 </Window>
diff --git a/src/Soloplan.WhatsON.GUI/MainWindow.xaml.cs b/src/Soloplan.WhatsON.GUI/MainWindow.xaml.cs
@@ -78,15 +78,9 @@ public bool IsTreeInitialized
       {
         this.initialized = value;
         this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.IsTreeInitialized)));
-        this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(this.IsTreeNotInitialized)));
       }
     }
 
-    public bool IsTreeNotInitialized
-    {
-      get => !this.IsTreeInitialized;
-    }
-
     /// <summary>
     /// Gets or sets a value indicating whether configuration was modified from tree view.
     /// </summary>
@@ -152,6 +146,11 @@ public void FocusSubject(Subject subject)
 
     private void OpenConfig(object sender, EventArgs e)
     {
+      if (this.ConfigurationModifiedFromTree)
+      {
+        return;
+      }
+
       var configWindow = new ConfigWindow(this.config);
       configWindow.Owner = this;
       configWindow.ConfigurationApplied += (s, ev) =>
@@ -200,10 +199,14 @@ private void NewConnectorClick(object sender, RoutedEventArgs e)
 
     private void MainTreeViewOnConfigurationChanged(object sender, EventArgs e)
     {
+      var showAnimation = !this.ConfigurationModifiedFromTree;
       this.ConfigurationModifiedFromTree = true;
-      if (this.FindResource("showStoryBoard") is Storyboard sb)
+      if (showAnimation)
       {
-        this.BeginStoryboard(sb);
+        if (this.FindResource("showStoryBoard") is Storyboard sb)
+        {
+          this.BeginStoryboard(sb);
+        }
       }
     }