Object graph - Expanded properties are in bold.

src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj

@@ -222,6 +222,7 @@
     <Compile Include="Visualizers\Common\VirtualizingCollection.cs" />
     <Compile Include="Visualizers\Common\VirtualizingObservableCollection.cs" />
     <Compile Include="Visualizers\Controls\DragScrollViewer.cs" />
+    <Compile Include="Visualizers\Graph\Drawing\BoolToBoldConverter.cs" />
     <Compile Include="Visualizers\Graph\Drawing\PositionedGraphNodeControl.xaml.cs">
       <DependentUpon>PositionedGraphNodeControl.xaml</DependentUpon>
       <SubType>Code</SubType>

src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/BoolToBoldConverter.cs

@@ -0,0 +1,30 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Debugger.AddIn.Visualizers
+{
+	/// <summary>
+	/// Used for TextBlocks in PositionedGraphNodeControl, to make property name bold when the property is expanded. 
+	/// </summary>
+	public class BoolToBoldConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			if (!(value is bool))
+				return FontWeights.Normal;
+			
+			return (bool)value ? FontWeights.Bold : FontWeights.Normal;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/NodeControlResources.xaml

@@ -2,13 +2,16 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:local="clr-namespace:Debugger.AddIn.Visualizers"
 >
-	<local:TooltipVisibilityConverter x:Key="toolVisConverter"></local:TooltipVisibilityConverter>
+	<local:TooltipVisibilityConverter x:Key="TooltipVisibilityConverter"></local:TooltipVisibilityConverter>
+	<local:BoolToBoldConverter x:Key="BoolToBoldConverter"></local:BoolToBoldConverter>
+	
+	
 	<DataTemplate x:Key="valueColumnTemplate">
         <TextBlock Text="{Binding Text}" MaxWidth="200">
             <TextBlock.ToolTip>
                 <ToolTip 
                         DataContext="{Binding Path=PlacementTarget, RelativeSource={x:Static RelativeSource.Self}}" 
-                        Visibility="{Binding Converter={StaticResource toolVisConverter}, ConverterParameter=2}">
+                        Visibility="{Binding Converter={StaticResource TooltipVisibilityConverter}, ConverterParameter=2}">
                     <TextBlock Text="{Binding Text}"></TextBlock>
                 </ToolTip>
             </TextBlock.ToolTip>

src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Drawing/PositionedGraphNodeControl.xaml

@@ -14,7 +14,7 @@
 	
     <aero:SystemDropShadowChrome>
     <Grid>
-        <ListView Name="listView" AlternationCount="2" ScrollViewer.VerticalScrollBarVisibility="Auto">
+        <ListView Name="listView" ScrollViewer.VerticalScrollBarVisibility="Auto">
             <ListView.Background>
                 <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
                     <GradientStop Color="#ddeeff"  Offset="0.0" />
@@ -29,16 +29,15 @@
                     <Setter Property="BorderThickness" Value="1" />
                     <Setter Property="Focusable" Value="false" />
                     <Style.Triggers>
-
+                    	<!-- 
                         <Trigger Property="ItemsControl.AlternationIndex" Value="0">
                             <Setter Property="Background" Value="Transparent"></Setter>
                         </Trigger>
                         <Trigger Property="ItemsControl.AlternationIndex" Value="1">
                             <Setter Property="Background" Value="Transparent"></Setter>
                         </Trigger>
-
+						 -->
                         <DataTrigger Binding="{Binding IsNested}" Value="True">
-                            <Setter Property="Background" Value="Transparent"></Setter>
                             <Setter Property="Foreground" Value="#666666"></Setter>
                             <Setter Property="FontStyle" Value="Italic"></Setter>
                         </DataTrigger>
@@ -57,8 +56,9 @@
                         	 		<Setter Property="FrameworkElement.Height" Value="1"/>
                             </Style>
                         </GridView.ColumnHeaderContainerStyle>
+                	    <!-- Databound item is ContentNode -->
                         <GridView.Columns>
-                        	   <!-- Expand button (either property or nested) -->
+                        	 <!-- Expand button (either property or nested) -->
                             <GridViewColumn Header="Plus" Width="20">
                                 <GridViewColumn.CellTemplate>
                                     <DataTemplate>
@@ -66,6 +66,7 @@
                                             <ToggleButton x:Name="Expander" Margin="-6 0" IsChecked="{Binding IsExpanded}" Click="NestedExpandButton_Click" Padding="0"></ToggleButton>
                                             <ToggleButton x:Name="PropertyExpander" Margin="-6 0" IsChecked="{Binding IsPropertyExpanded}" Click="PropertyExpandButton_Click" Padding="0"></ToggleButton>
                                         </StackPanel>
+                                    	<!-- Do this by converter, not Triggers! -->
                                         <DataTemplate.Triggers>
                                             <DataTrigger Binding="{Binding Path=HasChildren}" Value="False">
                                                 <Setter TargetName="Expander"
@@ -80,19 +81,17 @@
                                     </DataTemplate>
                                 </GridViewColumn.CellTemplate>
                             </GridViewColumn>
-                        	   <!-- Name -->
+                        	 <!-- Name -->
                             <GridViewColumn Header="Name" Width="Auto">
                                 <GridViewColumn.CellTemplate>
                                     <DataTemplate>
-                                        		<!--
-                                        		<TextBlock Text="hello" MinWidth="100"></TextBlock>
-												-->
                                     	<StackPanel Orientation="Horizontal">
-                                            <TextBlock MouseDown="TextBlock_MouseDown" Text="{Binding Name}"></TextBlock></StackPanel>
+                                            <TextBlock Text="{Binding Name}" FontWeight="{Binding IsPropertyExpanded, Converter={StaticResource BoolToBoldConverter}}"></TextBlock>
+                                    	</StackPanel>
                                     </DataTemplate>
                                 </GridViewColumn.CellTemplate>
                             </GridViewColumn>
-                        	   <!-- Text -->
+                        	 <!-- Text -->
                             <GridViewColumn Header="Value      " Width="Auto" CellTemplate="{StaticResource valueColumnTemplate}">
                             </GridViewColumn>
                         </GridView.Columns>

src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/ExpandedPaths.cs

@@ -11,7 +11,7 @@ namespace Debugger.AddIn.Visualizers.Graph
 	/// </summary>
 	public class ExpandedPaths
 	{
-		private Dictionary<string, bool> expandedNodes = new Dictionary<string, bool>();
+		private Dictionary<string, bool> expandedPaths = new Dictionary<string, bool>();
 		
 		public ExpandedPaths()
 		{
@@ -19,17 +19,17 @@ namespace Debugger.AddIn.Visualizers.Graph
 		
 		public bool IsExpanded(string path)
 		{
-			return expandedNodes.ContainsKey(path) && (expandedNodes[path] == true);
+			return expandedPaths.ContainsKey(path) && (expandedPaths[path] == true);
 		}
 		
 		public void SetExpanded(string path)
 		{
-			expandedNodes[path] = true;
+			expandedPaths[path] = true;
 		}
 		
 		public void SetCollapsed(string path)
 		{
-			expandedNodes[path] = false;
+			expandedPaths[path] = false;
 		}
 	}
 }

src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentNode.cs

@@ -88,13 +88,24 @@ namespace Debugger.AddIn.Visualizers.Graph.Layout
 		/// </summary>
 		public virtual bool ShowExpandPropertyButton
 		{
-			get 
-			{
-				// this is NestedNodeViewModel -> no property, don't show expand button
+			get  {
+				// this is ContentNode -> no property, don't show expand button
 				return false;
 			}
 		}
 		
+		/// <summary>
+		/// Is this an expanded Property node?
+		/// </summary>
+		public virtual bool IsPropertyExpanded
+		{
+			get  {
+				// this is ContentNode -> no property, don't show expand button
+				return false;
+			}
+			set { throw new InvalidOperationException("Cannot set IsPropertyExpanded on " + typeof(ContentNode).Name); }
+		}
+		
 		/// <summary>
 		/// Returns flattened subtree.
 		/// </summary>
@@ -136,48 +147,40 @@ namespace Debugger.AddIn.Visualizers.Graph.Layout
 		}
 		#endregion
 		
-		public virtual void InitFrom(AbstractNode source, Expanded expanded)
+		public virtual void InitOverride(AbstractNode source, Expanded expanded)
 		{
-			this.Name = getContentNodeName(source);
+			this.Name = GetContentNodeName(source);
 			this.Text = "";			// lazy evaluated later
 			this.IsNested = true;
 			this.path = this.Parent == null ? this.Name : this.Parent.Path + "." + this.Name;
 			this.IsExpanded = (source is ThisNode) || expanded.ContentNodes.IsExpanded(this);
 				
-			foreach (AbstractNode child in source.Children)
-			{
-				if (child is PropertyNode)
-				{
-					var newChild = new ContentPropertyNode(this.ContainingNode, this);
-					newChild.InitFrom(child, expanded);
-					this.Children.Add(newChild);
-				}
-				else
-				{
-					var newChild = new ContentNode(this.ContainingNode, this);
-					newChild.InitFrom(child, expanded);
-					this.Children.Add(newChild);					
+			foreach (AbstractNode child in source.Children) {
+				ContentNode newChild = null;
+				if (child is PropertyNode) {
+					newChild = new ContentPropertyNode(this.ContainingNode, this);
+				} else {
+					newChild = new ContentNode(this.ContainingNode, this);
 				}
+				newChild.InitOverride(child, expanded);
+				this.Children.Add(newChild);
 			}
 		}
 		
-		private string getContentNodeName(AbstractNode source)
+		private string GetContentNodeName(AbstractNode source)
 		{
-			if (source is ThisNode)
-			{
+			if (source is ThisNode)	{
 				return "this";
 			}
 			
-			if (source is NonPublicMembersNode)
-			{
+			if (source is NonPublicMembersNode)	{
 				return StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.NonPublicMembers}");
 			}
 			
 			var sourceBaseClassNode = source as BaseClassNode;
-			if (sourceBaseClassNode != null)
-			{
-				//return StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.BaseClass}") + " " + sourceBaseClassNode.TypeName;
-				return sourceBaseClassNode.TypeName;
+			if (sourceBaseClassNode != null) {
+				string baseClassString = StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.BaseClass}");
+				return string.Format("{0} ({1})", sourceBaseClassNode.TypeName, baseClassString);
 			}
 
 			throw new ApplicationException("Unknown AbstractNode.");

src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/ContentPropertyNode.cs

@@ -31,7 +31,7 @@ namespace Debugger.AddIn.Visualizers.Graph.Layout
 			get { return this.positionedProperty.IsEvaluated; }
 		}
 		
-		public bool IsPropertyExpanded
+		public override bool IsPropertyExpanded
 		{
 			get { return this.positionedProperty.IsPropertyExpanded; }
 			set { this.positionedProperty.IsPropertyExpanded = value; }
@@ -52,19 +52,19 @@ namespace Debugger.AddIn.Visualizers.Graph.Layout
 			}
 		}
 		
-		public override void InitFrom(AbstractNode source, Expanded expanded)
+		public override void InitOverride(AbstractNode source, Expanded expanded)
 		{
 			if (!(source is PropertyNode))
-				throw new InvalidOperationException("PropertyNodeViewModel must initialize from PropertyNode");
+				throw new InvalidOperationException(string.Format("{0} must initialize from {1}", typeof(ContentPropertyNode).Name, typeof(PropertyNode).Name));
 			
 			PropertyNode sourcePropertyNode = source as PropertyNode;
 			
 			this.Name = sourcePropertyNode.Property.Name;
 			// Important to set Text here, as we might be just building new view over existing (evaluated) model.
-			// Evaluated also in Evaluate() if needed.
+			// If the model is not evaluated yet, this will be string.Empty and filled in Evaluate().
 			this.Text = sourcePropertyNode.Property.Value;		
 			this.IsNested = false;
-			this.IsExpanded = false;			// always false, property content nodes are never expanded
+			this.IsExpanded = false;			// always false, Property nodes are never expanded (they have IsPropertyExpanded)
 			this.positionedProperty = new PositionedNodeProperty(
 				sourcePropertyNode.Property, this.ContainingNode,
 				expanded.Expressions.IsExpanded(sourcePropertyNode.Property.Expression));

src/AddIns/Debugger/Debugger.AddIn/Visualizers/Graph/Layout/PositionedGraphNode.cs

@@ -61,11 +61,10 @@ namespace Debugger.AddIn.Visualizers.Graph.Layout
 			}
 		}
 		
-		// TODO for speedup of re-layout only, posNodeForObjectGraphNode will be a service, that will return existing posNodes or create empty new
 		public void InitContentFromObjectNode(Expanded expanded)
 		{
 			this.Content = new ContentNode(this, null);
-			this.Content.InitFrom(this.ObjectNode.Content, expanded);
+			this.Content.InitOverride(this.ObjectNode.Content, expanded);
 			this.nodeVisualControl.Root = this.Content;
 		}