Browse Source
Merge branch 'master' into fixes/failing-debug-build-tests
pull/6044/head
Steven Kirk
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
16 additions and
6 deletions
-
src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
-
src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
-
src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
-
src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs
|
|
|
@ -26,9 +26,11 @@ namespace Avalonia.Diagnostics.ViewModels |
|
|
|
public AvaloniaProperty Property { get; } |
|
|
|
public override object Key => Property; |
|
|
|
public override string Name { get; } |
|
|
|
public bool IsAttached => Property.IsAttached; |
|
|
|
public override bool? IsAttached => |
|
|
|
Property.IsAttached; |
|
|
|
|
|
|
|
public string Priority => _priority; |
|
|
|
public override string Priority => |
|
|
|
_priority; |
|
|
|
|
|
|
|
public override string Type => _type; |
|
|
|
|
|
|
|
@ -69,7 +71,7 @@ namespace Avalonia.Diagnostics.ViewModels |
|
|
|
if (val != null) |
|
|
|
{ |
|
|
|
RaiseAndSetIfChanged(ref _priority, val.Priority.ToString(), nameof(Priority)); |
|
|
|
RaiseAndSetIfChanged(ref _group, IsAttached ? "Attached Properties" : "Properties", nameof(Group)); |
|
|
|
RaiseAndSetIfChanged(ref _group, IsAttached == true ? "Attached Properties" : "Properties", nameof(Group)); |
|
|
|
} |
|
|
|
else |
|
|
|
{ |
|
|
|
|
|
|
|
@ -49,6 +49,12 @@ namespace Avalonia.Diagnostics.ViewModels |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public override string Priority => |
|
|
|
string.Empty; |
|
|
|
|
|
|
|
public override bool? IsAttached => |
|
|
|
default; |
|
|
|
|
|
|
|
// [MemberNotNull(nameof(_type))]
|
|
|
|
public override void Update() |
|
|
|
{ |
|
|
|
|
|
|
|
@ -18,7 +18,7 @@ namespace Avalonia.Diagnostics.ViewModels |
|
|
|
{ |
|
|
|
private readonly IVisual _control; |
|
|
|
private readonly IDictionary<object, List<PropertyViewModel>> _propertyIndex; |
|
|
|
private AvaloniaPropertyViewModel? _selectedProperty; |
|
|
|
private PropertyViewModel? _selectedProperty; |
|
|
|
private bool _snapshotStyles; |
|
|
|
private bool _showInactiveStyles; |
|
|
|
private string? _styleStatus; |
|
|
|
@ -139,7 +139,7 @@ namespace Avalonia.Diagnostics.ViewModels |
|
|
|
|
|
|
|
public ObservableCollection<PseudoClassViewModel> PseudoClasses { get; } |
|
|
|
|
|
|
|
public AvaloniaPropertyViewModel? SelectedProperty |
|
|
|
public PropertyViewModel? SelectedProperty |
|
|
|
{ |
|
|
|
get => _selectedProperty; |
|
|
|
set => RaiseAndSetIfChanged(ref _selectedProperty, value); |
|
|
|
|
|
|
|
@ -16,7 +16,9 @@ namespace Avalonia.Diagnostics.ViewModels |
|
|
|
public abstract string Group { get; } |
|
|
|
public abstract string Type { get; } |
|
|
|
public abstract string Value { get; set; } |
|
|
|
public abstract void Update(); |
|
|
|
public abstract string Priority { get; } |
|
|
|
public abstract bool? IsAttached { get; } |
|
|
|
public abstract void Update(); |
|
|
|
|
|
|
|
protected static string ConvertToString(object? value) |
|
|
|
{ |
|
|
|
|