1 files changed, 28 insertions, 11 deletions
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml.cs
index 5e4509beb..0a4a05c04 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.IDE/ScriptIDEView2.xaml.cs
@@ -8,10 +8,12 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Interactivity;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Tango.Scripting.IDE.Controls;
 
 namespace Tango.Scripting.IDE
 {
@@ -23,6 +25,7 @@ namespace Tango.Scripting.IDE
     {
         public enum eSkin { Dark, Light }
         public static eSkin Skin { get; set; }
+        
         public ScriptIDEView2()
         {
             InitializeComponent();
@@ -57,31 +60,44 @@ namespace Tango.Scripting.IDE
         {
             MessageBox.Show("I am here");
         }
-        private void TreeViewControl_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
-        {
 
-            IProject SelectedItem = SolutionTree.SelectedItem as IProject;
-            if(SelectedItem != null && DataContext is ScriptIDEViewVM && ((ScriptIDEViewVM)DataContext).IsSolutionProject(SelectedItem))
+        #region selection solution trees
+        private TreeViewItem _selectedtreeViewItem;
+        private TreeViewItem SelectedtreeViewItem
+        {
+            get
             {
-                SolutionTree.ContextMenu = SolutionTree.Resources["SolutionContext"] as System.Windows.Controls.ContextMenu;
+                return _selectedtreeViewItem;
             }
-            else
+            set
             {
-                SolutionTree.ContextMenu = SolutionTree.Resources["FolderContext"] as System.Windows.Controls.ContextMenu;
+                if (_selectedtreeViewItem != null)
+                {
+                    _selectedtreeViewItem.IsSelected = false;
+                }
+                _selectedtreeViewItem = value;
+                _selectedtreeViewItem.IsSelected = true;
             }
-        }
 
+        }
         private void SolutionTree_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
             TreeViewItem treeViewItem = VisualUpwardSearch(e.OriginalSource as DependencyObject);
-
             if (treeViewItem != null)
             {
-                //treeViewItem.Focus();
-                treeViewItem.IsSelected = true;
+                SelectedtreeViewItem = treeViewItem;
                 e.Handled = true;
             }
         }
+        private void SolutionTree_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            TreeViewItem treeViewItem = VisualUpwardSearch(e.OriginalSource as DependencyObject);
+
+            if (treeViewItem != null)
+            {
+                SelectedtreeViewItem = treeViewItem;
+            }
+        }
         static TreeViewItem VisualUpwardSearch(DependencyObject source)
         {
             while (source != null && !(source is TreeViewItem))
@@ -89,5 +105,6 @@ namespace Tango.Scripting.IDE
 
             return source as TreeViewItem;
         }
+        #endregion
     }
 }