Browse Source

Merge pull request #4950 from pr8x/devtools-misc-fixes

Devtools misc fixes
fixes/tmp
Benedikt Stebner 6 years ago
committed by GitHub
parent
commit
f1301f4aa3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
  2. 6
      src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
  3. 3
      src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml

7
src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs

@ -23,6 +23,8 @@ namespace Avalonia.Diagnostics.ViewModels
if (visual is IControl control) if (visual is IControl control)
{ {
ElementName = control.Name;
var removed = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>( var removed = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
x => control.DetachedFromLogicalTree += x, x => control.DetachedFromLogicalTree += x,
x => control.DetachedFromLogicalTree -= x); x => control.DetachedFromLogicalTree -= x);
@ -61,6 +63,11 @@ namespace Avalonia.Diagnostics.ViewModels
private set { RaiseAndSetIfChanged(ref _classes, value); } private set { RaiseAndSetIfChanged(ref _classes, value); }
} }
public string ElementName
{
get;
}
public IVisual Visual public IVisual Visual
{ {
get; get;

6
src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml

@ -26,6 +26,12 @@
<DataGridTextColumn Header="Type" Binding="{Binding Type}" /> <DataGridTextColumn Header="Type" Binding="{Binding Type}" />
<DataGridTextColumn Header="Priority" Binding="{Binding Priority}" IsReadOnly="True" /> <DataGridTextColumn Header="Priority" Binding="{Binding Priority}" IsReadOnly="True" />
</DataGrid.Columns> </DataGrid.Columns>
<DataGrid.Styles>
<Style Selector="DataGridRow TextBox">
<Setter Property="SelectionBrush" Value="LightBlue"/>
</Style>
</DataGrid.Styles>
</DataGrid> </DataGrid>
</Grid> </Grid>

3
src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml

@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels" xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
x:Class="Avalonia.Diagnostics.Views.TreePageView"> x:Class="Avalonia.Diagnostics.Views.TreePageView">
<Grid ColumnDefinitions="*,4,3*"> <Grid ColumnDefinitions="0.8*,4,*">
<TreeView Name="tree" <TreeView Name="tree"
BorderThickness="0" BorderThickness="0"
Items="{Binding Nodes}" Items="{Binding Nodes}"
@ -13,6 +13,7 @@
<StackPanel Orientation="Horizontal" Spacing="8"> <StackPanel Orientation="Horizontal" Spacing="8">
<TextBlock Text="{Binding Type}"/> <TextBlock Text="{Binding Type}"/>
<TextBlock Text="{Binding Classes}"/> <TextBlock Text="{Binding Classes}"/>
<TextBlock Foreground="Gray" Text="{Binding ElementName}"/>
</StackPanel> </StackPanel>
</TreeDataTemplate> </TreeDataTemplate>
</TreeView.DataTemplates> </TreeView.DataTemplates>

Loading…
Cancel
Save