From a9d0e8ee7eac8fd4ca02f474aaa4c231021d3c75 Mon Sep 17 00:00:00 2001
From: Daniel Kraus <krada@gmx.net>
Date: Wed, 12 Aug 2015 22:29:31 +0200
Subject: [PATCH] Add IsExpanded property to ElementViewModel.

---
 zaaReloaded2/ViewModels/ElementViewModel.cs  | 12 +++++++++++-
 zaaReloaded2/ViewModels/SettingsViewModel.cs |  2 ++
 zaaReloaded2/Views/SettingsView.xaml         |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/zaaReloaded2/ViewModels/ElementViewModel.cs b/zaaReloaded2/ViewModels/ElementViewModel.cs
index 2fe3d61..a6757f1 100755
--- a/zaaReloaded2/ViewModels/ElementViewModel.cs
+++ b/zaaReloaded2/ViewModels/ElementViewModel.cs
@@ -41,6 +41,16 @@ namespace zaaReloaded2.ViewModels
 
         public abstract string ToolTip { get;  }
 
+        public bool IsExpanded
+        {
+            get { return _isExpanded; }
+            set
+            {
+                _isExpanded = value;
+                OnPropertyChanged("IsExpanded");
+            }
+        }
+
         #endregion
 
         #region Constructors
@@ -77,7 +87,7 @@ namespace zaaReloaded2.ViewModels
 
         #region Fields
 
-        string _displayString;
+        bool _isExpanded;
 
         #endregion
     }
diff --git a/zaaReloaded2/ViewModels/SettingsViewModel.cs b/zaaReloaded2/ViewModels/SettingsViewModel.cs
index 2ead6db..152ce75 100755
--- a/zaaReloaded2/ViewModels/SettingsViewModel.cs
+++ b/zaaReloaded2/ViewModels/SettingsViewModel.cs
@@ -503,6 +503,7 @@ namespace zaaReloaded2.ViewModels
                         ControlElementViewModel controlElementAbove =
                             Elements[index - 1] as ControlElementViewModel;
                         Elements.RemoveAt(index);
+                        controlElementAbove.IsExpanded = true;
                         controlElementAbove.AddChildElement(
                             lastSelectedElement as FormatElementViewModel);
                         FormatElementBase model = lastSelectedElement.RevealModelObject() as FormatElementBase;
@@ -599,6 +600,7 @@ namespace zaaReloaded2.ViewModels
                         ControlElementViewModel controlElementBelow =
                             Elements[index + 1] as ControlElementViewModel;
                         Elements.RemoveAt(index);
+                        controlElementBelow.IsExpanded = true;
                         controlElementBelow.Elements.Insert(
                             0, 
                             lastSelectedElement as FormatElementViewModel);
diff --git a/zaaReloaded2/Views/SettingsView.xaml b/zaaReloaded2/Views/SettingsView.xaml
index 7870078..3e77e7b 100755
--- a/zaaReloaded2/Views/SettingsView.xaml
+++ b/zaaReloaded2/Views/SettingsView.xaml
@@ -95,7 +95,7 @@
                 <TreeView ItemsSource="{Binding Elements}">
                     <TreeView.ItemContainerStyle>
                         <Style TargetType="{x:Type TreeViewItem}">
-                            <!--<Setter Property="IsExpanded" Value="True" />-->
+                            <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
                             <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
                             <Setter Property="ToolTip" Value="{Binding ToolTip}" />
                         </Style>