Browse Source

add type column to tooltips

pull/59/merge
Siegfried Pammer 13 years ago
parent
commit
678ce75f0b
  1. 38
      src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml
  2. 2
      src/AddIns/Debugger/Debugger.AddIn/TreeModel/ValueNode.cs

38
src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml

@ -63,7 +63,7 @@
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
<ControlTemplate x:Key="PinButtonTemplate" TargetType="Button"> <ControlTemplate x:Key="PinButtonTemplate" TargetType="Button">
<Border Width="16" Height="16" Name="TheBorder" CornerRadius="3" BorderThickness="1" BorderBrush="Black" Background="{StaticResource SilverPressedBrushKey}"> <Border Width="16" Height="16" Name="TheBorder" CornerRadius="3" BorderThickness="1" BorderBrush="Black" Background="{StaticResource SilverPressedBrushKey}">
<Canvas Name="TheCanvas"> <Canvas Name="TheCanvas">
@ -87,7 +87,7 @@
</ControlTemplate> </ControlTemplate>
<SolidColorBrush x:Key="MouseOverPinBrush" Color="Black" /> <SolidColorBrush x:Key="MouseOverPinBrush" Color="Black" />
<Style TargetType="{x:Type TextBox}" x:Key="TextStyle"> <Style TargetType="{x:Type TextBox}" x:Key="TextStyle">
<Setter Property="OverridesDefaultStyle" Value="True" /> <Setter Property="OverridesDefaultStyle" Value="True" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
@ -105,7 +105,7 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<Style x:Key="PinThumbStyle" TargetType="Thumb"> <Style x:Key="PinThumbStyle" TargetType="Thumb">
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
@ -115,7 +115,7 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
<core:ContextMenuBuilder x:Key="menuBuilder" /> <core:ContextMenuBuilder x:Key="menuBuilder" />
</ResourceDictionary> </ResourceDictionary>
@ -182,16 +182,16 @@
Focusable="False" Focusable="False"
Width="19" Width="19"
Height="13" Height="13"
> >
<ToggleButton.Template> <ToggleButton.Template>
<ControlTemplate TargetType="{x:Type ToggleButton}"> <ControlTemplate TargetType="{x:Type ToggleButton}">
<Border Width="19" Height="13" Background="Transparent"> <Border Width="19" Height="13" Background="Transparent">
<Border Width="9" <Border Width="9"
Height="9" Height="9"
BorderThickness="1" BorderThickness="1"
BorderBrush="#FF7898B5" BorderBrush="#FF7898B5"
CornerRadius="1" CornerRadius="1"
SnapsToDevicePixels="true"> SnapsToDevicePixels="true">
<Border.Background> <Border.Background>
<LinearGradientBrush StartPoint="0,0" EndPoint="1,1"> <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
<LinearGradientBrush.GradientStops> <LinearGradientBrush.GradientStops>
@ -201,9 +201,9 @@
</LinearGradientBrush> </LinearGradientBrush>
</Border.Background> </Border.Background>
<Path x:Name="ExpandPath" <Path x:Name="ExpandPath"
Margin="1,1,1,1" Margin="1,1,1,1"
Fill="Black" Fill="Black"
Data="M 0 2 L 0 3 L 2 3 L 2 5 L 3 5 L 3 3 L 5 3 L 5 2 L 3 2 L 3 0 L 2 0 L 2 2 Z"/> Data="M 0 2 L 0 3 L 2 3 L 2 5 L 3 5 L 3 3 L 5 3 L 5 2 L 3 2 L 3 0 L 2 0 L 2 2 Z"/>
</Border> </Border>
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
@ -242,6 +242,16 @@
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<!-- Type -->
<DataGridTemplateColumn MinWidth="20" Header="Type">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Border BorderBrush="#FFDDDDDD" BorderThickness="0 0 1 0">
<TextBlock Margin="6 0" Text="{Binding Path=Type, Mode=OneWay}" VerticalAlignment="Top"></TextBlock>
</Border>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!-- Visualizer picker --> <!-- Visualizer picker -->
<DataGridTemplateColumn> <DataGridTemplateColumn>
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
@ -271,7 +281,7 @@
</DataGridTemplateColumn> </DataGridTemplateColumn>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
<!-- <StackPanel Opacity="0.2" Name="SideButtons" Margin="3"> <!-- <StackPanel Opacity="0.2" Name="SideButtons" Margin="3">
<Button <Button
Name="CloseButton" Name="CloseButton"
Click="CloseButton_Click" Click="CloseButton_Click"

2
src/AddIns/Debugger/Debugger.AddIn/TreeModel/ValueNode.cs

@ -252,7 +252,7 @@ namespace Debugger.AddIn.TreeModel
ClassBrowserIconService.Class, ClassBrowserIconService.Class,
StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.BaseClass}"), StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.BaseClass}"),
baseType.Name, baseType.Name,
baseType.FullName, string.Empty,
baseType.FullName == "System.Object" ? (Func<IEnumerable<TreeNode>>) null : () => GetObjectChildren(baseType) baseType.FullName == "System.Object" ? (Func<IEnumerable<TreeNode>>) null : () => GetObjectChildren(baseType)
); );
} }

Loading…
Cancel
Save