diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 34f931ff41..46e8665945 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -18,7 +18,7 @@
- [ ] Added unit tests (if possible)?
- [ ] Added XML documentation to any related classes?
-- [ ] Consider submitting a PR to https://github.com/AvaloniaUI/Avaloniaui.net with user documentation
+- [ ] Consider submitting a PR to https://github.com/AvaloniaUI/Documentation with user documentation
## Breaking changes
diff --git a/native/Avalonia.Native/src/OSX/window.h b/native/Avalonia.Native/src/OSX/window.h
index b1f64bca88..6a4ca2b8d8 100644
--- a/native/Avalonia.Native/src/OSX/window.h
+++ b/native/Avalonia.Native/src/OSX/window.h
@@ -34,6 +34,7 @@ class WindowBaseImpl;
-(double) getScaling;
-(double) getExtendedTitleBarHeight;
-(void) setIsExtended:(bool)value;
+-(void) updateShadow;
@end
struct INSWindowHolder
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index d7afbdaa3a..e7c144b2d3 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -124,7 +124,11 @@ public:
[Window setTitle:_lastTitle];
_shown = true;
-
+
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [Window updateShadow];
+ });
+
return S_OK;
}
}
@@ -1838,6 +1842,19 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
double _lastScaling;
}
+- (void)updateShadow
+{
+ // Common problem in Cocoa where [invalidateShadow] does work,
+ // This hack forces Cocoa to invalidate the shadow.
+
+ NSRect frame = [self frame];
+ NSRect updatedFrame = NSMakeRect(frame.origin.x, frame.origin.y, frame.size.width + 1.0, frame.size.height + 1.0);
+ [self setFrame:updatedFrame display:YES];
+ [self setFrame:frame display:YES];
+
+ [self invalidateShadow];
+}
+
-(void) setIsExtended:(bool)value;
{
_isExtended = value;
diff --git a/samples/ControlCatalog/App.xaml.cs b/samples/ControlCatalog/App.xaml.cs
index 020fb2fff3..f3ec7b48aa 100644
--- a/samples/ControlCatalog/App.xaml.cs
+++ b/samples/ControlCatalog/App.xaml.cs
@@ -39,6 +39,10 @@ namespace ControlCatalog
public static Styles DefaultLight = new Styles
{
+ new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+ {
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/AccentColors.xaml")
+ },
new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
{
Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/Base.xaml")
@@ -60,6 +64,10 @@ namespace ControlCatalog
public static Styles DefaultDark = new Styles
{
+ new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
+ {
+ Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/AccentColors.xaml")
+ },
new StyleInclude(new Uri("resm:Styles?assembly=ControlCatalog"))
{
Source = new Uri("avares://Avalonia.Themes.Fluent/Accents/Base.xaml")
diff --git a/samples/ControlCatalog/Pages/ViewboxPage.xaml b/samples/ControlCatalog/Pages/ViewboxPage.xaml
index 6e649b39a5..ef802db33e 100644
--- a/samples/ControlCatalog/Pages/ViewboxPage.xaml
+++ b/samples/ControlCatalog/Pages/ViewboxPage.xaml
@@ -12,8 +12,9 @@
-
+
@@ -25,7 +26,7 @@
-
+
diff --git a/samples/ControlCatalog/Pages/ViewboxPage.xaml.cs b/samples/ControlCatalog/Pages/ViewboxPage.xaml.cs
index 7a2bceb8f2..94b3f3ea14 100644
--- a/samples/ControlCatalog/Pages/ViewboxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/ViewboxPage.xaml.cs
@@ -6,23 +6,18 @@ namespace ControlCatalog.Pages
{
public class ViewboxPage : UserControl
{
- private readonly Viewbox _viewbox;
- private readonly ComboBox _stretchSelector;
-
public ViewboxPage()
{
InitializeComponent();
- _viewbox = this.FindControl("Viewbox");
-
- _stretchSelector = this.FindControl("StretchSelector");
+ var stretchSelector = this.FindControl("StretchSelector");
- _stretchSelector.Items = new[]
+ stretchSelector.Items = new[]
{
Stretch.Uniform, Stretch.UniformToFill, Stretch.Fill, Stretch.None
};
- _stretchSelector.SelectedIndex = 0;
+ stretchSelector.SelectedIndex = 0;
var stretchDirectionSelector = this.FindControl("StretchDirectionSelector");
@@ -38,10 +33,5 @@ namespace ControlCatalog.Pages
{
AvaloniaXamlLoader.Load(this);
}
-
- private void StretchSelector_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
- {
- _viewbox.Stretch = (Stretch) _stretchSelector.SelectedItem!;
- }
}
}
diff --git a/samples/RenderDemo/Pages/AnimationsPage.xaml b/samples/RenderDemo/Pages/AnimationsPage.xaml
index 12fb31ea59..21c7d68b5d 100644
--- a/samples/RenderDemo/Pages/AnimationsPage.xaml
+++ b/samples/RenderDemo/Pages/AnimationsPage.xaml
@@ -1,7 +1,8 @@
+ x:Class="RenderDemo.Pages.AnimationsPage"
+ MaxWidth="600">
@@ -167,8 +168,8 @@
-
- Hover to activate Transform Keyframe Animations.
+
+ Hover to activate Keyframe Animations.
diff --git a/samples/RenderDemo/Pages/TransitionsPage.xaml b/samples/RenderDemo/Pages/TransitionsPage.xaml
index d6da293ff3..f9f69fb341 100644
--- a/samples/RenderDemo/Pages/TransitionsPage.xaml
+++ b/samples/RenderDemo/Pages/TransitionsPage.xaml
@@ -1,7 +1,8 @@
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ x:Class="RenderDemo.Pages.TransitionsPage"
+ MaxWidth="600">
@@ -90,6 +91,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -98,8 +149,8 @@
-
- Hover to activate Transform Keyframe Animations.
+
+ Hover to activate Transitions.
@@ -109,6 +160,12 @@
+
+
+
+
+
+
diff --git a/src/Avalonia.Animation/Transitions/DoubleTransition.cs b/src/Avalonia.Animation/Transitions/DoubleTransition.cs
index 8cae1e1f81..d5bb1aac20 100644
--- a/src/Avalonia.Animation/Transitions/DoubleTransition.cs
+++ b/src/Avalonia.Animation/Transitions/DoubleTransition.cs
@@ -1,6 +1,8 @@
using System;
using System.Reactive.Linq;
+using Avalonia.Animation.Animators;
+
namespace Avalonia.Animation
{
///
@@ -8,15 +10,13 @@ namespace Avalonia.Animation
///
public class DoubleTransition : Transition
{
+ private static readonly DoubleAnimator s_animator = new DoubleAnimator();
+
///
public override IObservable DoTransition(IObservable progress, double oldValue, double newValue)
{
return progress
- .Select(p =>
- {
- var f = Easing.Ease(p);
- return ((newValue - oldValue) * f) + oldValue;
- });
+ .Select(progress => s_animator.Interpolate(Easing.Ease(progress), oldValue, newValue));
}
}
}
diff --git a/src/Avalonia.Animation/Transitions/FloatTransition.cs b/src/Avalonia.Animation/Transitions/FloatTransition.cs
index 427563e559..37b644fa96 100644
--- a/src/Avalonia.Animation/Transitions/FloatTransition.cs
+++ b/src/Avalonia.Animation/Transitions/FloatTransition.cs
@@ -1,6 +1,8 @@
using System;
using System.Reactive.Linq;
+using Avalonia.Animation.Animators;
+
namespace Avalonia.Animation
{
///
@@ -8,12 +10,13 @@ namespace Avalonia.Animation
///
public class FloatTransition : Transition
{
+ private static readonly FloatAnimator s_animator = new FloatAnimator();
+
///
public override IObservable DoTransition(IObservable progress, float oldValue, float newValue)
{
- var delta = newValue - oldValue;
return progress
- .Select(p => (float)Easing.Ease(p) * delta + oldValue);
+ .Select(progress => s_animator.Interpolate(Easing.Ease(progress), oldValue, newValue));
}
}
}
diff --git a/src/Avalonia.Animation/Transitions/IntegerTransition.cs b/src/Avalonia.Animation/Transitions/IntegerTransition.cs
index 7a85bd75dc..223b2ba531 100644
--- a/src/Avalonia.Animation/Transitions/IntegerTransition.cs
+++ b/src/Avalonia.Animation/Transitions/IntegerTransition.cs
@@ -1,6 +1,8 @@
using System;
using System.Reactive.Linq;
+using Avalonia.Animation.Animators;
+
namespace Avalonia.Animation
{
///
@@ -8,12 +10,13 @@ namespace Avalonia.Animation
///
public class IntegerTransition : Transition
{
+ private static readonly Int32Animator s_animator = new Int32Animator();
+
///
public override IObservable DoTransition(IObservable progress, int oldValue, int newValue)
{
- var delta = newValue - oldValue;
return progress
- .Select(p => (int)(Easing.Ease(p) * delta + oldValue));
+ .Select(progress => s_animator.Interpolate(Easing.Ease(progress), oldValue, newValue));
}
}
}
diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index a070a1b9d7..1b4632d368 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -535,7 +535,8 @@ namespace Avalonia.Controls
AvaloniaProperty.RegisterDirect(
nameof(SelectedIndex),
o => o.SelectedIndex,
- (o, v) => o.SelectedIndex = v);
+ (o, v) => o.SelectedIndex = v,
+ defaultBindingMode: BindingMode.TwoWay);
///
/// Gets or sets the index of the current selection.
@@ -553,7 +554,8 @@ namespace Avalonia.Controls
AvaloniaProperty.RegisterDirect(
nameof(SelectedItem),
o => o.SelectedItem,
- (o, v) => o.SelectedItem = v);
+ (o, v) => o.SelectedItem = v,
+ defaultBindingMode: BindingMode.TwoWay);
///
/// Gets or sets the data item corresponding to the selected row.
diff --git a/src/Avalonia.Controls/ApiCompatBaseline.txt b/src/Avalonia.Controls/ApiCompatBaseline.txt
index 7199c15d21..a79b3b4d7b 100644
--- a/src/Avalonia.Controls/ApiCompatBaseline.txt
+++ b/src/Avalonia.Controls/ApiCompatBaseline.txt
@@ -4,10 +4,11 @@ InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Avalon
InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.IMenuItem.StaysOpenOnClick.set(System.Boolean)' is present in the implementation but not in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.INativeMenuExporterEventsImplBridge.RaiseClosed()' is present in the implementation but not in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Controls.INativeMenuExporterEventsImplBridge.RaiseOpening()' is present in the implementation but not in the contract.
+MembersMustExist : Member 'public Avalonia.AvaloniaProperty Avalonia.AvaloniaProperty Avalonia.Controls.Viewbox.StretchProperty' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'public void Avalonia.Controls.Embedding.Offscreen.OffscreenTopLevelImplBase.SetCursor(Avalonia.Platform.IPlatformHandle)' does not exist in the implementation but it does exist in the contract.
MembersMustExist : Member 'public Avalonia.AvaloniaProperty Avalonia.AvaloniaProperty Avalonia.Controls.Notifications.NotificationCard.CloseOnClickProperty' does not exist in the implementation but it does exist in the contract.
EnumValuesMustMatch : Enum value 'Avalonia.Platform.ExtendClientAreaChromeHints Avalonia.Platform.ExtendClientAreaChromeHints.Default' is (System.Int32)2 in the implementation but (System.Int32)1 in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.ITopLevelImpl.SetCursor(Avalonia.Platform.ICursorImpl)' is present in the implementation but not in the contract.
InterfacesShouldHaveSameMembers : Interface member 'public void Avalonia.Platform.ITopLevelImpl.SetCursor(Avalonia.Platform.IPlatformHandle)' is present in the contract but not in the implementation.
MembersMustExist : Member 'public void Avalonia.Platform.ITopLevelImpl.SetCursor(Avalonia.Platform.IPlatformHandle)' does not exist in the implementation but it does exist in the contract.
-Total Issues: 11
+Total Issues: 12
diff --git a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
index e4ff5e9e5b..d0cf772c01 100644
--- a/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
+++ b/src/Avalonia.Controls/DateTimePickers/TimePicker.cs
@@ -8,7 +8,7 @@ using System.Globalization;
namespace Avalonia.Controls
{
///
- /// A control to allow the user to select a time
+ /// A control to allow the user to select a time.
///
[PseudoClasses(":hasnotime")]
public class TimePicker : TemplatedControl
diff --git a/src/Avalonia.Controls/Expander.cs b/src/Avalonia.Controls/Expander.cs
index 9ff2e41fa9..052b42a233 100644
--- a/src/Avalonia.Controls/Expander.cs
+++ b/src/Avalonia.Controls/Expander.cs
@@ -4,14 +4,35 @@ using Avalonia.Controls.Primitives;
namespace Avalonia.Controls
{
+ ///
+ /// Direction in which an control opens.
+ ///
public enum ExpandDirection
{
+ ///
+ /// Opens down.
+ ///
Down,
+
+ ///
+ /// Opens up.
+ ///
Up,
+
+ ///
+ /// Opens left.
+ ///
Left,
+
+ ///
+ /// Opens right.
+ ///
Right
}
+ ///
+ /// A control with a header that has a collapsible content section.
+ ///
[PseudoClasses(":expanded", ":up", ":down", ":left", ":right")]
public class Expander : HeaderedContentControl
{
diff --git a/src/Avalonia.Controls/Grid.cs b/src/Avalonia.Controls/Grid.cs
index 105a2744e5..c7d598006d 100644
--- a/src/Avalonia.Controls/Grid.cs
+++ b/src/Avalonia.Controls/Grid.cs
@@ -17,7 +17,7 @@ using Avalonia.VisualTree;
namespace Avalonia.Controls
{
///
- /// Grid
+ /// Defines a flexible grid area that consists of columns and rows.
///
public class Grid : Panel
{
diff --git a/src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs b/src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs
index 90727a3505..e62e087140 100644
--- a/src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs
+++ b/src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs
@@ -1,10 +1,28 @@
namespace Avalonia.Controls.Primitives
{
+ ///
+ /// Specifies the visibility of a for scrollable content.
+ ///
public enum ScrollBarVisibility
{
+ ///
+ /// No scrollbars and no scrolling in this dimension.
+ ///
Disabled,
+
+ ///
+ /// The scrollbar should be visible only if there is more content than fits in the viewport.
+ ///
Auto,
+
+ ///
+ /// The scrollbar should never be visible. No space should ever be reserved for the scrollbar.
+ ///
Hidden,
+
+ ///
+ /// The scrollbar should always be visible. Space should always be reserved for the scrollbar.
+ ///
Visible,
}
}
diff --git a/src/Avalonia.Controls/RadioButton.cs b/src/Avalonia.Controls/RadioButton.cs
index 4bda241497..681278d247 100644
--- a/src/Avalonia.Controls/RadioButton.cs
+++ b/src/Avalonia.Controls/RadioButton.cs
@@ -8,6 +8,9 @@ using Avalonia.VisualTree;
namespace Avalonia.Controls
{
+ ///
+ /// Represents a button that allows a user to select a single option from a group of options.
+ ///
public class RadioButton : ToggleButton
{
private class RadioButtonGroupManager
diff --git a/src/Avalonia.Controls/RelativePanel.cs b/src/Avalonia.Controls/RelativePanel.cs
index 2305d8fb9e..c5de004f09 100644
--- a/src/Avalonia.Controls/RelativePanel.cs
+++ b/src/Avalonia.Controls/RelativePanel.cs
@@ -8,6 +8,9 @@ using Avalonia.Layout;
namespace Avalonia.Controls
{
+ ///
+ /// Defines an area within which you can position and align child objects in relation to each other or the parent panel.
+ ///
public partial class RelativePanel : Panel
{
private readonly Graph _childGraph;
diff --git a/src/Avalonia.Controls/RepeatButton.cs b/src/Avalonia.Controls/RepeatButton.cs
index fcd6607feb..ba770634d9 100644
--- a/src/Avalonia.Controls/RepeatButton.cs
+++ b/src/Avalonia.Controls/RepeatButton.cs
@@ -4,6 +4,9 @@ using Avalonia.Threading;
namespace Avalonia.Controls
{
+ ///
+ /// Represents a control that raises its event repeatedly when it is pressed and held.
+ ///
public class RepeatButton : Button
{
///
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 69da667011..3c221cbf27 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -17,6 +17,9 @@ using Avalonia.Controls.Metadata;
namespace Avalonia.Controls
{
+ ///
+ /// Represents a control that can be used to display or edit unformatted text.
+ ///
[PseudoClasses(":empty")]
public class TextBox : TemplatedControl, UndoRedoHelper.IUndoRedoHost
{
@@ -260,7 +263,11 @@ namespace Avalonia.Controls
set
{
value = CoerceCaretIndex(value);
- SetAndRaise(SelectionStartProperty, ref _selectionStart, value);
+ var changed = SetAndRaise(SelectionStartProperty, ref _selectionStart, value);
+ if (changed)
+ {
+ UpdateCommandStates();
+ }
if (SelectionStart == SelectionEnd)
{
CaretIndex = SelectionStart;
@@ -278,7 +285,11 @@ namespace Avalonia.Controls
set
{
value = CoerceCaretIndex(value);
- SetAndRaise(SelectionEndProperty, ref _selectionEnd, value);
+ var changed = SetAndRaise(SelectionEndProperty, ref _selectionEnd, value);
+ if (changed)
+ {
+ UpdateCommandStates();
+ }
if (SelectionStart == SelectionEnd)
{
CaretIndex = SelectionEnd;
diff --git a/src/Avalonia.Controls/Viewbox.cs b/src/Avalonia.Controls/Viewbox.cs
index b65f4b31d8..624c61bb82 100644
--- a/src/Avalonia.Controls/Viewbox.cs
+++ b/src/Avalonia.Controls/Viewbox.cs
@@ -11,7 +11,7 @@ namespace Avalonia.Controls
///
/// Defines the property.
///
- public static readonly AvaloniaProperty StretchProperty =
+ public static readonly StyledProperty StretchProperty =
AvaloniaProperty.Register(nameof(Stretch), Stretch.Uniform);
///
@@ -20,8 +20,6 @@ namespace Avalonia.Controls
public static readonly StyledProperty StretchDirectionProperty =
AvaloniaProperty.Register(nameof(StretchDirection), StretchDirection.Both);
- private Stretch _stretch = Stretch.Uniform;
-
static Viewbox()
{
ClipToBoundsProperty.OverrideDefaultValue(true);
@@ -34,8 +32,8 @@ namespace Avalonia.Controls
///
public Stretch Stretch
{
- get => _stretch;
- set => SetAndRaise(StretchProperty, ref _stretch, value);
+ get => GetValue(StretchProperty);
+ set => SetValue(StretchProperty, value);
}
///
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml
new file mode 100644
index 0000000000..c202d13778
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.axaml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ThicknessEditor.cs b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs
similarity index 90%
rename from src/Avalonia.Diagnostics/Diagnostics/Views/ThicknessEditor.cs
rename to src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs
index c7611c8c46..e5b3b080e2 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ThicknessEditor.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Controls/ThicknessEditor.cs
@@ -1,21 +1,9 @@
using Avalonia.Controls;
using Avalonia.Data;
-using Avalonia.Data.Converters;
using Avalonia.Media;
-namespace Avalonia.Diagnostics.Views
+namespace Avalonia.Diagnostics.Controls
{
- internal static class Converters
- {
- public static IValueConverter HasConstraintConverter =
- new FuncValueConverter(ConvertToDecoration);
-
- private static TextDecorationCollection ConvertToDecoration(object arg)
- {
- return arg != null ? TextDecorations.Underline : null;
- }
- }
-
internal class ThicknessEditor : ContentControl
{
public static readonly DirectProperty ThicknessProperty =
@@ -44,7 +32,9 @@ namespace Avalonia.Diagnostics.Views
AvaloniaProperty.RegisterDirect(nameof(Bottom), o => o.Bottom,
(o, v) => o.Bottom = v);
-
+ public static readonly StyledProperty HighlightProperty =
+ AvaloniaProperty.Register(nameof(Highlight));
+
private Thickness _thickness;
private string _header;
private bool _isPresent = true;
@@ -52,7 +42,6 @@ namespace Avalonia.Diagnostics.Views
private double _top;
private double _right;
private double _bottom;
-
private bool _isUpdatingThickness;
public Thickness Thickness
@@ -97,6 +86,12 @@ namespace Avalonia.Diagnostics.Views
set => SetAndRaise(BottomProperty, ref _bottom, value);
}
+ public IBrush Highlight
+ {
+ get => GetValue(HighlightProperty);
+ set => SetValue(HighlightProperty, value);
+ }
+
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Converters/EnumToCheckedConverter.cs b/src/Avalonia.Diagnostics/Diagnostics/Converters/EnumToCheckedConverter.cs
new file mode 100644
index 0000000000..8d10981ba7
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Converters/EnumToCheckedConverter.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Globalization;
+using Avalonia.Data;
+using Avalonia.Data.Converters;
+
+namespace Avalonia.Diagnostics.Converters
+{
+ internal class EnumToCheckedConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ return Equals(value, parameter);
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (value is bool isChecked && isChecked)
+ {
+ return parameter;
+ }
+
+ return BindingOperations.DoNothing;
+ }
+ }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
index ee46192207..f9978f3b7e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
@@ -19,8 +19,8 @@ namespace Avalonia.Diagnostics
public bool ShowAsChildWindow { get; set; } = true;
///
- /// Gets or sets the initial size of the DevTools window. The default value is 1024x512.
+ /// Gets or sets the initial size of the DevTools window. The default value is 1280x720.
///
- public Size Size { get; set; } = new Size(1024, 512);
+ public Size Size { get; set; } = new Size(1280, 720);
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
index fd2e4c3355..b0718bc6ce 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlLayoutViewModel.cs
@@ -1,4 +1,6 @@
+using System;
using System.ComponentModel;
+using System.Text;
using Avalonia.Controls;
using Avalonia.Layout;
using Avalonia.VisualTree;
@@ -8,27 +10,58 @@ namespace Avalonia.Diagnostics.ViewModels
internal class ControlLayoutViewModel : ViewModelBase
{
private readonly IVisual _control;
- private Thickness _marginThickness;
private Thickness _borderThickness;
- private Thickness _paddingThickness;
- private double _width;
private double _height;
- private string _widthConstraint;
private string _heightConstraint;
+ private HorizontalAlignment _horizontalAlignment;
+ private Thickness _marginThickness;
+ private Thickness _paddingThickness;
private bool _updatingFromControl;
+ private VerticalAlignment _verticalAlignment;
+ private double _width;
+ private string _widthConstraint;
+
+ public ControlLayoutViewModel(IVisual control)
+ {
+ _control = control;
+
+ HasPadding = AvaloniaPropertyRegistry.Instance.IsRegistered(control, Decorator.PaddingProperty);
+ HasBorder = AvaloniaPropertyRegistry.Instance.IsRegistered(control, Border.BorderThicknessProperty);
+
+ if (control is AvaloniaObject ao)
+ {
+ MarginThickness = ao.GetValue(Layoutable.MarginProperty);
+
+ if (HasPadding)
+ {
+ PaddingThickness = ao.GetValue(Decorator.PaddingProperty);
+ }
+
+ if (HasBorder)
+ {
+ BorderThickness = ao.GetValue(Border.BorderThicknessProperty);
+ }
+
+ HorizontalAlignment = ao.GetValue(Layoutable.HorizontalAlignmentProperty);
+ VerticalAlignment = ao.GetValue(Layoutable.VerticalAlignmentProperty);
+ }
+
+ UpdateSize();
+ UpdateSizeConstraints();
+ }
public Thickness MarginThickness
{
get => _marginThickness;
set => RaiseAndSetIfChanged(ref _marginThickness, value);
}
-
+
public Thickness BorderThickness
{
get => _borderThickness;
set => RaiseAndSetIfChanged(ref _borderThickness, value);
}
-
+
public Thickness PaddingThickness
{
get => _paddingThickness;
@@ -59,35 +92,21 @@ namespace Avalonia.Diagnostics.ViewModels
private set => RaiseAndSetIfChanged(ref _heightConstraint, value);
}
- public bool HasPadding { get; }
-
- public bool HasBorder { get; }
-
- public ControlLayoutViewModel(IVisual control)
+ public HorizontalAlignment HorizontalAlignment
{
- _control = control;
-
- HasPadding = AvaloniaPropertyRegistry.Instance.IsRegistered(control, Decorator.PaddingProperty);
- HasBorder = AvaloniaPropertyRegistry.Instance.IsRegistered(control, Border.BorderThicknessProperty);
-
- if (control is AvaloniaObject ao)
- {
- MarginThickness = ao.GetValue(Layoutable.MarginProperty);
+ get => _horizontalAlignment;
+ private set => RaiseAndSetIfChanged(ref _horizontalAlignment, value);
+ }
- if (HasPadding)
- {
- PaddingThickness = ao.GetValue(Decorator.PaddingProperty);
- }
+ public VerticalAlignment VerticalAlignment
+ {
+ get => _verticalAlignment;
+ private set => RaiseAndSetIfChanged(ref _verticalAlignment, value);
+ }
- if (HasBorder)
- {
- BorderThickness = ao.GetValue(Border.BorderThicknessProperty);
- }
- }
+ public bool HasPadding { get; }
- UpdateSize();
- UpdateSizeConstraints();
- }
+ public bool HasBorder { get; }
private void UpdateSizeConstraints()
{
@@ -95,12 +114,27 @@ namespace Avalonia.Diagnostics.ViewModels
{
string CreateConstraintInfo(StyledProperty minProperty, StyledProperty maxProperty)
{
- if (ao.IsSet(minProperty) || ao.IsSet(maxProperty))
+ bool hasMin = ao.IsSet(minProperty);
+ bool hasMax = ao.IsSet(maxProperty);
+
+ if (hasMin || hasMax)
{
- var minValue = ao.GetValue(minProperty);
- var maxValue = ao.GetValue(maxProperty);
+ var builder = new StringBuilder();
+
+ if (hasMin)
+ {
+ var minValue = ao.GetValue(minProperty);
+ builder.AppendFormat("Min: {0}", Math.Round(minValue, 2));
+ builder.AppendLine();
+ }
- return $"{minValue} < size < {maxValue}";
+ if (hasMax)
+ {
+ var maxValue = ao.GetValue(maxProperty);
+ builder.AppendFormat("Max: {0}", Math.Round(maxValue, 2));
+ }
+
+ return builder.ToString();
}
return null;
@@ -134,6 +168,14 @@ namespace Avalonia.Diagnostics.ViewModels
{
ao.SetValue(Border.BorderThicknessProperty, BorderThickness);
}
+ else if (e.PropertyName == nameof(HorizontalAlignment))
+ {
+ ao.SetValue(Layoutable.HorizontalAlignmentProperty, HorizontalAlignment);
+ }
+ else if (e.PropertyName == nameof(VerticalAlignment))
+ {
+ ao.SetValue(Layoutable.VerticalAlignmentProperty, VerticalAlignment);
+ }
}
}
@@ -154,15 +196,15 @@ namespace Avalonia.Diagnostics.ViewModels
if (e.Property == Layoutable.MarginProperty)
{
MarginThickness = ao.GetValue(Layoutable.MarginProperty);
- }
+ }
else if (e.Property == Decorator.PaddingProperty)
{
PaddingThickness = ao.GetValue(Decorator.PaddingProperty);
- }
+ }
else if (e.Property == Border.BorderThicknessProperty)
{
BorderThickness = ao.GetValue(Border.BorderThicknessProperty);
- }
+ }
else if (e.Property == Layoutable.MinWidthProperty ||
e.Property == Layoutable.MaxWidthProperty ||
e.Property == Layoutable.MinHeightProperty ||
@@ -170,6 +212,14 @@ namespace Avalonia.Diagnostics.ViewModels
{
UpdateSizeConstraints();
}
+ else if (e.Property == Layoutable.HorizontalAlignmentProperty)
+ {
+ HorizontalAlignment = ao.GetValue(Layoutable.HorizontalAlignmentProperty);
+ }
+ else if (e.Property == Layoutable.VerticalAlignmentProperty)
+ {
+ VerticalAlignment = ao.GetValue(Layoutable.VerticalAlignmentProperty);
+ }
}
}
}
@@ -183,8 +233,8 @@ namespace Avalonia.Diagnostics.ViewModels
{
var size = _control.Bounds;
- Width = size.Width;
- Height = size.Height;
+ Width = Math.Round(size.Width, 2);
+ Height = Math.Round(size.Height, 2);
}
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index 9ba576c826..ab651b2a06 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -7,66 +7,10 @@
x:Name="Main">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -108,164 +52,133 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
-
+
-
-
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- (
-
-
- )
+
+
+
+
-
-
-
+
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (
+
+
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
index c9568509f6..c6bd5a18aa 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
@@ -1,24 +1,10 @@
-using System;
using Avalonia.Controls;
-using Avalonia.Controls.Shapes;
using Avalonia.Markup.Xaml;
-using Avalonia.VisualTree;
namespace Avalonia.Diagnostics.Views
{
internal class ControlDetailsView : UserControl
{
- private ThicknessEditor _borderArea;
- private ThicknessEditor _paddingArea;
- private Rectangle _horizontalSizeBegin;
- private Rectangle _horizontalSizeEnd;
- private Rectangle _verticalSizeBegin;
- private Rectangle _verticalSizeEnd;
- private Grid _layoutRoot;
- private Border _horizontalSize;
- private Border _verticalSize;
- private Border _contentArea;
-
public ControlDetailsView()
{
InitializeComponent();
@@ -27,101 +13,6 @@ namespace Avalonia.Diagnostics.Views
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
-
- _borderArea = this.FindControl("BorderArea");
- _paddingArea = this.FindControl("PaddingArea");
-
- _horizontalSizeBegin = this.FindControl("HorizontalSizeBegin");
- _horizontalSizeEnd = this.FindControl("HorizontalSizeEnd");
- _verticalSizeBegin = this.FindControl("VerticalSizeBegin");
- _verticalSizeEnd = this.FindControl("VerticalSizeEnd");
-
- _horizontalSize = this.FindControl("HorizontalSize");
- _verticalSize = this.FindControl("VerticalSize");
-
- _contentArea = this.FindControl("ContentArea");
-
- _layoutRoot = this.FindControl("LayoutRoot");
-
- void SubscribeToBounds(Visual visual)
- {
- visual.GetPropertyChangedObservable(TransformedBoundsProperty)
- .Subscribe(UpdateSizeGuidelines);
- }
-
- SubscribeToBounds(_borderArea);
- SubscribeToBounds(_paddingArea);
- SubscribeToBounds(_contentArea);
- }
-
- private void UpdateSizeGuidelines(AvaloniaPropertyChangedEventArgs e)
- {
- void UpdateGuidelines(Visual area)
- {
- if (area.TransformedBounds is TransformedBounds bounds)
- {
- // Horizontal guideline
- {
- var sizeArea = TranslateToRoot((_horizontalSize.TransformedBounds ?? default).Bounds.BottomLeft,
- _horizontalSize);
-
- var start = TranslateToRoot(bounds.Bounds.BottomLeft, area);
-
- SetPosition(_horizontalSizeBegin, start);
-
- var end = TranslateToRoot(bounds.Bounds.BottomRight, area);
-
- SetPosition(_horizontalSizeEnd, end.WithX(end.X - 1));
-
- var height = sizeArea.Y - start.Y + 2;
-
- _horizontalSizeBegin.Height = height;
- _horizontalSizeEnd.Height = height;
- }
-
- // Vertical guideline
- {
- var sizeArea = TranslateToRoot((_verticalSize.TransformedBounds ?? default).Bounds.TopRight, _verticalSize);
-
- var start = TranslateToRoot(bounds.Bounds.TopRight, area);
-
- SetPosition(_verticalSizeBegin, start);
-
- var end = TranslateToRoot(bounds.Bounds.BottomRight, area);
-
- SetPosition(_verticalSizeEnd, end.WithY(end.Y - 1));
-
- var width = sizeArea.X - start.X + 2;
-
- _verticalSizeBegin.Width = width;
- _verticalSizeEnd.Width = width;
- }
- }
- }
-
- Point TranslateToRoot(Point point, IVisual from)
- {
- return from.TranslatePoint(point, _layoutRoot) ?? default;
- }
-
- static void SetPosition(Rectangle rect, Point start)
- {
- Canvas.SetLeft(rect, start.X);
- Canvas.SetTop(rect, start.Y);
- }
-
- if (_borderArea.IsPresent)
- {
- UpdateGuidelines(_borderArea);
- }
- else if (_paddingArea.IsPresent)
- {
- UpdateGuidelines(_paddingArea);
- }
- else
- {
- UpdateGuidelines(_contentArea);
- }
}
}
}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
new file mode 100644
index 0000000000..af6c84a76a
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml.cs
new file mode 100644
index 0000000000..d4a09f7296
--- /dev/null
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/LayoutExplorerView.axaml.cs
@@ -0,0 +1,128 @@
+using System;
+using Avalonia.Controls;
+using Avalonia.Controls.Shapes;
+using Avalonia.Diagnostics.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
+
+namespace Avalonia.Diagnostics.Views
+{
+ internal class LayoutExplorerView : UserControl
+ {
+ private readonly ThicknessEditor _borderArea;
+ private readonly ThicknessEditor _paddingArea;
+ private readonly Rectangle _horizontalSizeBegin;
+ private readonly Rectangle _horizontalSizeEnd;
+ private readonly Rectangle _verticalSizeBegin;
+ private readonly Rectangle _verticalSizeEnd;
+ private readonly Grid _layoutRoot;
+ private readonly Border _horizontalSize;
+ private readonly Border _verticalSize;
+ private readonly Border _contentArea;
+
+ public LayoutExplorerView()
+ {
+ InitializeComponent();
+
+ _borderArea = this.FindControl("BorderArea");
+ _paddingArea = this.FindControl("PaddingArea");
+
+ _horizontalSizeBegin = this.FindControl("HorizontalSizeBegin");
+ _horizontalSizeEnd = this.FindControl("HorizontalSizeEnd");
+ _verticalSizeBegin = this.FindControl("VerticalSizeBegin");
+ _verticalSizeEnd = this.FindControl("VerticalSizeEnd");
+
+ _horizontalSize = this.FindControl("HorizontalSize");
+ _verticalSize = this.FindControl("VerticalSize");
+
+ _contentArea = this.FindControl("ContentArea");
+
+ _layoutRoot = this.FindControl("LayoutRoot");
+
+ void SubscribeToBounds(Visual visual)
+ {
+ visual.GetPropertyChangedObservable(TransformedBoundsProperty)
+ .Subscribe(UpdateSizeGuidelines);
+ }
+
+ SubscribeToBounds(_borderArea);
+ SubscribeToBounds(_paddingArea);
+ SubscribeToBounds(_contentArea);
+ }
+
+ private void InitializeComponent()
+ {
+ AvaloniaXamlLoader.Load(this);
+ }
+
+ private void UpdateSizeGuidelines(AvaloniaPropertyChangedEventArgs e)
+ {
+ void UpdateGuidelines(Visual area)
+ {
+ if (area.TransformedBounds is TransformedBounds bounds)
+ {
+ // Horizontal guideline
+ {
+ var sizeArea = TranslateToRoot((_horizontalSize.TransformedBounds ?? default).Bounds.BottomLeft,
+ _horizontalSize);
+
+ var start = TranslateToRoot(bounds.Bounds.BottomLeft, area);
+
+ SetPosition(_horizontalSizeBegin, start);
+
+ var end = TranslateToRoot(bounds.Bounds.BottomRight, area);
+
+ SetPosition(_horizontalSizeEnd, end.WithX(end.X - 1));
+
+ var height = sizeArea.Y - start.Y + 2;
+
+ _horizontalSizeBegin.Height = height;
+ _horizontalSizeEnd.Height = height;
+ }
+
+ // Vertical guideline
+ {
+ var sizeArea = TranslateToRoot((_verticalSize.TransformedBounds ?? default).Bounds.TopRight, _verticalSize);
+
+ var start = TranslateToRoot(bounds.Bounds.TopRight, area);
+
+ SetPosition(_verticalSizeBegin, start);
+
+ var end = TranslateToRoot(bounds.Bounds.BottomRight, area);
+
+ SetPosition(_verticalSizeEnd, end.WithY(end.Y - 1));
+
+ var width = sizeArea.X - start.X + 2;
+
+ _verticalSizeBegin.Width = width;
+ _verticalSizeEnd.Width = width;
+ }
+ }
+ }
+
+ Point TranslateToRoot(Point point, IVisual from)
+ {
+ return from.TranslatePoint(point, _layoutRoot) ?? default;
+ }
+
+ static void SetPosition(Rectangle rect, Point start)
+ {
+ Canvas.SetLeft(rect, start.X);
+ Canvas.SetTop(rect, start.Y);
+ }
+
+ if (_borderArea.IsPresent)
+ {
+ UpdateGuidelines(_borderArea);
+ }
+ else if (_paddingArea.IsPresent)
+ {
+ UpdateGuidelines(_paddingArea);
+ }
+ else
+ {
+ UpdateGuidelines(_contentArea);
+ }
+ }
+ }
+}
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
index 7dd4ed0832..7628ee2d8c 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml
@@ -15,6 +15,7 @@
+
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
index 86137dfc57..a5328716fc 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml
@@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:vm="clr-namespace:Avalonia.Diagnostics.ViewModels"
x:Class="Avalonia.Diagnostics.Views.TreePageView">
-
+
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
index 1b61986ce6..3e1a238b36 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/TreePageView.xaml.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
using System.Linq;
using Avalonia.Controls;
using Avalonia.Controls.Generators;
@@ -6,6 +7,7 @@ using Avalonia.Diagnostics.ViewModels;
using Avalonia.Input;
using Avalonia.Markup.Xaml;
using Avalonia.Media;
+using Avalonia.VisualTree;
namespace Avalonia.Diagnostics.Views
{
@@ -100,12 +102,19 @@ namespace Avalonia.Diagnostics.Views
private void TreeViewItemTemplateApplied(object sender, TemplateAppliedEventArgs e)
{
var item = (TreeViewItem)sender;
- var headerPresenter = item.HeaderPresenter;
- headerPresenter.ApplyTemplate();
- var header = headerPresenter.Child;
- header.PointerEnter += AddAdorner;
- header.PointerLeave += RemoveAdorner;
+ // This depends on the default tree item template.
+ // We want to handle events in the item header but exclude events coming from children.
+ var header = item.FindDescendantOfType();
+
+ Debug.Assert(header != null);
+
+ if (header != null)
+ {
+ header.PointerEnter += AddAdorner;
+ header.PointerLeave += RemoveAdorner;
+ }
+
item.TemplateApplied -= TreeViewItemTemplateApplied;
}
}
diff --git a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
index addc89b205..268171d467 100644
--- a/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
+++ b/src/Avalonia.Headless/HeadlessPlatformRenderInterface.cs
@@ -70,6 +70,28 @@ namespace Avalonia.Headless
return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
}
+ public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(string fileName)
+ {
+ return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(Stream stream)
+ {
+ return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
+ }
+
public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
{
return new HeadlessBitmapStub(new Size(1, 1), new Vector(96, 96));
diff --git a/src/Avalonia.Layout/WrapLayout/WrapLayout.cs b/src/Avalonia.Layout/WrapLayout/WrapLayout.cs
index dccbb2205e..ded2afc3dd 100644
--- a/src/Avalonia.Layout/WrapLayout/WrapLayout.cs
+++ b/src/Avalonia.Layout/WrapLayout/WrapLayout.cs
@@ -236,6 +236,15 @@ namespace Avalonia.Layout
// for the last condition it is zeros so adding it will make no difference
// this way is faster than an if condition in every loop for checking the last item
totalMeasure.U = parentMeasure.U;
+
+ // Propagating an infinite size causes a crash. This can happen if the parent is scrollable and infinite in the opposite
+ // axis to the panel. Clearing to zero prevents the crash.
+ // This is likely an incorrect use of the control by the developer, however we need stability here so setting a default that wont crash.
+ if (double.IsInfinity(totalMeasure.U))
+ {
+ totalMeasure.U = 0.0;
+ }
+
totalMeasure.V = state.GetHeight();
totalMeasure.U = Math.Ceiling(totalMeasure.U);
diff --git a/src/Avalonia.Native/WindowImplBase.cs b/src/Avalonia.Native/WindowImplBase.cs
index 71359f733d..f716464d14 100644
--- a/src/Avalonia.Native/WindowImplBase.cs
+++ b/src/Avalonia.Native/WindowImplBase.cs
@@ -414,9 +414,7 @@ namespace Avalonia.Native
public Action Input { get; set; }
- Action ScalingChanged { get; set; }
-
- Action ITopLevelImpl.ScalingChanged { get; set; }
+ public Action ScalingChanged { get; set; }
public Action TransparencyLevelChanged { get; set; }
diff --git a/src/Avalonia.Styling/Controls/Classes.cs b/src/Avalonia.Styling/Controls/Classes.cs
index 4e2783d4ec..50605661fa 100644
--- a/src/Avalonia.Styling/Controls/Classes.cs
+++ b/src/Avalonia.Styling/Controls/Classes.cs
@@ -2,6 +2,8 @@ using System;
using System.Collections.Generic;
using Avalonia.Collections;
+#nullable enable
+
namespace Avalonia.Controls
{
///
@@ -90,7 +92,7 @@ namespace Avalonia.Controls
}
///
- /// Remvoes all non-pseudoclasses from the collection.
+ /// Removes all non-pseudoclasses from the collection.
///
public override void Clear()
{
@@ -135,7 +137,7 @@ namespace Avalonia.Controls
///
public override void InsertRange(int index, IEnumerable names)
{
- var c = new List();
+ List? toInsert = null;
foreach (var name in names)
{
@@ -143,11 +145,16 @@ namespace Avalonia.Controls
if (!Contains(name))
{
- c.Add(name);
+ toInsert ??= new List();
+
+ toInsert.Add(name);
}
}
- base.InsertRange(index, c);
+ if (toInsert != null)
+ {
+ base.InsertRange(index, toInsert);
+ }
}
///
@@ -176,19 +183,21 @@ namespace Avalonia.Controls
///
public override void RemoveAll(IEnumerable names)
{
- var c = new List();
+ List? toRemove = null;
foreach (var name in names)
{
ThrowIfPseudoclass(name, "removed");
- if (Contains(name))
- {
- c.Add(name);
- }
+ toRemove ??= new List();
+
+ toRemove.Add(name);
}
- base.RemoveAll(c);
+ if (toRemove != null)
+ {
+ base.RemoveAll(toRemove);
+ }
}
///
@@ -223,7 +232,7 @@ namespace Avalonia.Controls
/// The new contents of the collection.
public void Replace(IList source)
{
- var toRemove = new List();
+ List? toRemove = null;
foreach (var name in source)
{
@@ -234,11 +243,17 @@ namespace Avalonia.Controls
{
if (!name.StartsWith(":"))
{
+ toRemove ??= new List();
+
toRemove.Add(name);
}
}
- base.RemoveAll(toRemove);
+ if (toRemove != null)
+ {
+ base.RemoveAll(toRemove);
+ }
+
base.AddRange(source);
}
diff --git a/src/Avalonia.Themes.Fluent/Accents/Base.xaml b/src/Avalonia.Themes.Fluent/Accents/Base.xaml
index 8597c76998..1e2acf736d 100644
--- a/src/Avalonia.Themes.Fluent/Accents/Base.xaml
+++ b/src/Avalonia.Themes.Fluent/Accents/Base.xaml
@@ -1,6 +1,7 @@
diff --git a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
index a6371a5be9..3f70939953 100644
--- a/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/Expander.xaml
@@ -1,141 +1,232 @@
-
+
+
+
+
+
+
+ Expanded content
+
+
+
+
+ Expanded content
+
+
+
+
+ Expanded content
+
+
+
+
+ Expanded content
+
+
+
+
+
+
+ 16
+ 16
+
+ 1
+
+ 1,1,0,1
+ 1,1,1,0
+ 0,1,1,1
+ 1,0,1,1
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs b/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
index cec96fecf8..a56cc1de8c 100644
--- a/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
+++ b/src/Avalonia.Visuals/Animation/Animators/SolidColorBrushAnimator.cs
@@ -12,6 +12,11 @@ namespace Avalonia.Animation.Animators
{
public override ISolidColorBrush Interpolate(double progress, ISolidColorBrush oldValue, ISolidColorBrush newValue)
{
+ if (oldValue is null || newValue is null)
+ {
+ return oldValue;
+ }
+
return new ImmutableSolidColorBrush(ColorAnimator.InterpolateCore(progress, oldValue.Color, newValue.Color));
}
@@ -26,6 +31,11 @@ namespace Avalonia.Animation.Animators
{
public override SolidColorBrush Interpolate(double progress, SolidColorBrush oldValue, SolidColorBrush newValue)
{
+ if (oldValue is null || newValue is null)
+ {
+ return oldValue;
+ }
+
return new SolidColorBrush(ColorAnimator.InterpolateCore(progress, oldValue.Color, newValue.Color));
}
}
diff --git a/src/Avalonia.Visuals/Animation/Transitions/BoxShadowsTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/BoxShadowsTransition.cs
new file mode 100644
index 0000000000..008613fb40
--- /dev/null
+++ b/src/Avalonia.Visuals/Animation/Transitions/BoxShadowsTransition.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Reactive.Linq;
+
+using Avalonia.Animation.Animators;
+using Avalonia.Media;
+
+namespace Avalonia.Animation
+{
+ ///
+ /// Transition class that handles with type.
+ ///
+ public class BoxShadowsTransition : Transition
+ {
+ private static readonly BoxShadowsAnimator s_animator = new BoxShadowsAnimator();
+
+ ///
+ public override IObservable DoTransition(IObservable progress, BoxShadows oldValue, BoxShadows newValue)
+ {
+ return progress
+ .Select(progress => s_animator.Interpolate(Easing.Ease(progress), oldValue, newValue));
+ }
+ }
+}
diff --git a/src/Avalonia.Visuals/Animation/Transitions/CornerRadiusTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/CornerRadiusTransition.cs
index 0b0f04ca94..9ffdf53694 100644
--- a/src/Avalonia.Visuals/Animation/Transitions/CornerRadiusTransition.cs
+++ b/src/Avalonia.Visuals/Animation/Transitions/CornerRadiusTransition.cs
@@ -1,6 +1,8 @@
using System;
using System.Reactive.Linq;
+using Avalonia.Animation.Animators;
+
namespace Avalonia.Animation
{
///
@@ -8,26 +10,13 @@ namespace Avalonia.Animation
///
public class CornerRadiusTransition : Transition
{
+ private static readonly CornerRadiusAnimator s_animator = new CornerRadiusAnimator();
+
///
public override IObservable DoTransition(IObservable progress, CornerRadius oldValue, CornerRadius newValue)
{
return progress
- .Select(p =>
- {
- var f = Easing.Ease(p);
-
- var deltaTL = newValue.TopLeft - oldValue.TopLeft;
- var deltaTR = newValue.TopRight - oldValue.TopRight;
- var deltaBR = newValue.BottomRight - oldValue.BottomRight;
- var deltaBL = newValue.BottomLeft - oldValue.BottomLeft;
-
- var nTL = f * deltaTL + oldValue.TopLeft;
- var nTR = f * deltaTR + oldValue.TopRight;
- var nBR = f * deltaBR + oldValue.BottomRight;
- var nBL = f * deltaBL + oldValue.BottomLeft;
-
- return new CornerRadius(nTL, nTR, nBR, nBL);
- });
+ .Select(progress => s_animator.Interpolate(Easing.Ease(progress), oldValue, newValue));
}
}
}
diff --git a/src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs
index 29db5fc868..fbe24c6d55 100644
--- a/src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs
+++ b/src/Avalonia.Visuals/Animation/Transitions/PointTransition.cs
@@ -1,6 +1,8 @@
using System;
using System.Reactive.Linq;
+using Avalonia.Animation.Animators;
+
namespace Avalonia.Animation
{
///
@@ -8,15 +10,13 @@ namespace Avalonia.Animation
///
public class PointTransition : Transition
{
+ private static readonly PointAnimator s_animator = new PointAnimator();
+
///
public override IObservable DoTransition(IObservable progress, Point oldValue, Point newValue)
{
return progress
- .Select(p =>
- {
- var f = Easing.Ease(p);
- return ((newValue - oldValue) * f) + oldValue;
- });
+ .Select(progress => s_animator.Interpolate(Easing.Ease(progress), oldValue, newValue));
}
}
}
diff --git a/src/Avalonia.Visuals/Animation/Transitions/SizeTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/SizeTransition.cs
index b40e789915..464f83bec7 100644
--- a/src/Avalonia.Visuals/Animation/Transitions/SizeTransition.cs
+++ b/src/Avalonia.Visuals/Animation/Transitions/SizeTransition.cs
@@ -1,6 +1,8 @@
using System;
using System.Reactive.Linq;
+using Avalonia.Animation.Animators;
+
namespace Avalonia.Animation
{
///
@@ -8,15 +10,13 @@ namespace Avalonia.Animation
///
public class SizeTransition : Transition
{
+ private static readonly SizeAnimator s_animator = new SizeAnimator();
+
///
public override IObservable DoTransition(IObservable progress, Size oldValue, Size newValue)
{
return progress
- .Select(p =>
- {
- var f = Easing.Ease(p);
- return ((newValue - oldValue) * f) + oldValue;
- });
+ .Select(progress => s_animator.Interpolate(Easing.Ease(progress), oldValue, newValue));
}
}
}
diff --git a/src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs
index 28d4ea067f..9fb3380780 100644
--- a/src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs
+++ b/src/Avalonia.Visuals/Animation/Transitions/ThicknessTransition.cs
@@ -1,6 +1,8 @@
using System;
using System.Reactive.Linq;
+using Avalonia.Animation.Animators;
+
namespace Avalonia.Animation
{
///
@@ -8,15 +10,13 @@ namespace Avalonia.Animation
///
public class ThicknessTransition : Transition
{
+ private static readonly ThicknessAnimator s_animator = new ThicknessAnimator();
+
///
public override IObservable DoTransition(IObservable progress, Thickness oldValue, Thickness newValue)
{
return progress
- .Select(p =>
- {
- var f = Easing.Ease(p);
- return ((newValue - oldValue) * f) + oldValue;
- });
+ .Select(progress => s_animator.Interpolate(Easing.Ease(progress), oldValue, newValue));
}
}
}
diff --git a/src/Avalonia.Visuals/Animation/Transitions/VectorTransition.cs b/src/Avalonia.Visuals/Animation/Transitions/VectorTransition.cs
index c073e8e192..5038117faa 100644
--- a/src/Avalonia.Visuals/Animation/Transitions/VectorTransition.cs
+++ b/src/Avalonia.Visuals/Animation/Transitions/VectorTransition.cs
@@ -1,6 +1,8 @@
using System;
using System.Reactive.Linq;
+using Avalonia.Animation.Animators;
+
namespace Avalonia.Animation
{
///
@@ -8,15 +10,13 @@ namespace Avalonia.Animation
///
public class VectorTransition : Transition
{
+ private static readonly VectorAnimator s_animator = new VectorAnimator();
+
///
public override IObservable DoTransition(IObservable progress, Vector oldValue, Vector newValue)
{
return progress
- .Select(p =>
- {
- var f = Easing.Ease(p);
- return ((newValue - oldValue) * f) + oldValue;
- });
+ .Select(progress => s_animator.Interpolate(Easing.Ease(progress), oldValue, newValue));
}
}
}
diff --git a/src/Avalonia.Visuals/ApiCompatBaseline.txt b/src/Avalonia.Visuals/ApiCompatBaseline.txt
index 35ba8f2b19..f9fd125615 100644
--- a/src/Avalonia.Visuals/ApiCompatBaseline.txt
+++ b/src/Avalonia.Visuals/ApiCompatBaseline.txt
@@ -64,3 +64,8 @@ InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IGl
InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IGlyphRunImpl Avalonia.Platform.IPlatformRenderInterface.CreateGlyphRun(Avalonia.Media.GlyphRun, System.Double)' is present in the contract but not in the implementation.
MembersMustExist : Member 'public Avalonia.Platform.IGlyphRunImpl Avalonia.Platform.IPlatformRenderInterface.CreateGlyphRun(Avalonia.Media.GlyphRun, System.Double)' does not exist in the implementation but it does exist in the contract.
Total Issues: 64
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmap(System.IO.Stream)' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmap(System.String)' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmapToHeight(System.IO.Stream, System.Int32, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode)' is present in the implementation but not in the contract.
+InterfacesShouldHaveSameMembers : Interface member 'public Avalonia.Platform.IWriteableBitmapImpl Avalonia.Platform.IPlatformRenderInterface.LoadWriteableBitmapToWidth(System.IO.Stream, System.Int32, Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode)' is present in the implementation but not in the contract.
+Total Issues: 11
diff --git a/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs b/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
index b86444bc2f..b0e1a954e6 100644
--- a/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
+++ b/src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs
@@ -1,5 +1,8 @@
using System;
+using System.IO;
+using System.Threading.Tasks;
using Avalonia.Platform;
+using Avalonia.Visuals.Media.Imaging;
namespace Avalonia.Media.Imaging
{
@@ -34,8 +37,50 @@ namespace Avalonia.Media.Imaging
{
}
+ private WriteableBitmap(IWriteableBitmapImpl impl) : base(impl)
+ {
+
+ }
+
public ILockedFramebuffer Lock() => ((IWriteableBitmapImpl) PlatformImpl.Item).Lock();
+ public static WriteableBitmap Decode(Stream stream)
+ {
+ var ri = AvaloniaLocator.Current.GetService();
+
+ return new WriteableBitmap(ri.LoadWriteableBitmap(stream));
+ }
+
+ ///
+ /// Loads a WriteableBitmap from a stream and decodes at the desired width. Aspect ratio is maintained.
+ /// This is more efficient than loading and then resizing.
+ ///
+ /// The stream to read the bitmap from. This can be any supported image format.
+ /// The desired width of the resulting bitmap.
+ /// The to use should any scaling be required.
+ /// An instance of the class.
+ public new static WriteableBitmap DecodeToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ var ri = AvaloniaLocator.Current.GetService();
+
+ return new WriteableBitmap(ri.LoadWriteableBitmapToWidth(stream, width, interpolationMode));
+ }
+
+ ///
+ /// Loads a Bitmap from a stream and decodes at the desired height. Aspect ratio is maintained.
+ /// This is more efficient than loading and then resizing.
+ ///
+ /// The stream to read the bitmap from. This can be any supported image format.
+ /// The desired height of the resulting bitmap.
+ /// The to use should any scaling be required.
+ /// An instance of the class.
+ public new static WriteableBitmap DecodeToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ var ri = AvaloniaLocator.Current.GetService();
+
+ return new WriteableBitmap(ri.LoadWriteableBitmapToHeight(stream, height, interpolationMode));
+ }
+
private static IBitmapImpl CreatePlatformImpl(PixelSize size, in Vector dpi, PixelFormat? format, AlphaFormat? alphaFormat)
{
var ri = AvaloniaLocator.Current.GetService();
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
index 723d5e81ab..b304b19910 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs
@@ -109,7 +109,8 @@ namespace Avalonia.Media.TextFormatting
GlyphRun.GlyphAdvances.Take(glyphCount),
GlyphRun.GlyphOffsets.Take(glyphCount),
GlyphRun.Characters.Take(length),
- GlyphRun.GlyphClusters.Take(glyphCount));
+ GlyphRun.GlyphClusters.Take(glyphCount),
+ GlyphRun.BiDiLevel);
var firstTextRun = new ShapedTextCharacters(firstGlyphRun, Properties);
@@ -120,7 +121,8 @@ namespace Avalonia.Media.TextFormatting
GlyphRun.GlyphAdvances.Skip(glyphCount),
GlyphRun.GlyphOffsets.Skip(glyphCount),
GlyphRun.Characters.Skip(length),
- GlyphRun.GlyphClusters.Skip(glyphCount));
+ GlyphRun.GlyphClusters.Skip(glyphCount),
+ GlyphRun.BiDiLevel);
var secondTextRun = new ShapedTextCharacters(secondGlyphRun, Properties);
diff --git a/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs b/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs
index c6f524451b..0779716ec8 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs
@@ -135,20 +135,20 @@ namespace Avalonia.Media.TextFormatting
count = 0;
var script = Script.Common;
- //var direction = BiDiClass.LeftToRight;
+ var direction = BiDiClass.LeftToRight;
var font = typeface.GlyphTypeface;
var defaultFont = defaultTypeface.GlyphTypeface;
-
+
var enumerator = new GraphemeEnumerator(text);
while (enumerator.MoveNext())
{
- var grapheme = enumerator.Current;
+ var currentGrapheme = enumerator.Current;
- var currentScript = grapheme.FirstCodepoint.Script;
+ var currentScript = currentGrapheme.FirstCodepoint.Script;
- //var currentDirection = grapheme.FirstCodepoint.BiDiClass;
+ var currentDirection = currentGrapheme.FirstCodepoint.BiDiClass;
//// ToDo: Implement BiDi algorithm
//if (currentScript.HorizontalDirection != direction)
@@ -161,36 +161,44 @@ namespace Avalonia.Media.TextFormatting
if (currentScript != script)
{
- if (currentScript != Script.Inherited && currentScript != Script.Common)
+ if (script == Script.Inherited || script == Script.Common)
{
- if (script == Script.Inherited || script == Script.Common)
- {
- script = currentScript;
- }
- else
+ script = currentScript;
+ }
+ else
+ {
+ if (currentScript != Script.Inherited && currentScript != Script.Common)
{
break;
}
}
}
- if (isFallback)
+ if (currentScript != Script.Common && currentScript != Script.Inherited)
{
- if (defaultFont.TryGetGlyph(grapheme.FirstCodepoint, out _))
+ if (isFallback && defaultFont.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
{
break;
}
- }
- if (!font.TryGetGlyph(grapheme.FirstCodepoint, out _))
- {
- if (!grapheme.FirstCodepoint.IsWhiteSpace)
+ if (!font.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
{
break;
}
}
- count += grapheme.Text.Length;
+ if (!currentGrapheme.FirstCodepoint.IsWhiteSpace && !font.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
+ {
+ break;
+ }
+
+ if (direction == BiDiClass.RightToLeft && currentDirection == BiDiClass.CommonSeparator)
+ {
+ break;
+ }
+
+ count += currentGrapheme.Text.Length;
+ direction = currentDirection;
}
return count > 0;
diff --git a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
index f0dbfee718..de67aca5a8 100644
--- a/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
+++ b/src/Avalonia.Visuals/Platform/IPlatformRenderInterface.cs
@@ -100,6 +100,38 @@ namespace Avalonia.Platform
/// An .
IBitmapImpl LoadBitmap(Stream stream);
+ ///
+ /// Loads a WriteableBitmap implementation from a stream to a specified width maintaining aspect ratio.
+ ///
+ /// The stream to read the bitmap from.
+ /// The desired width of the resulting bitmap.
+ /// The to use should resizing be required.
+ /// An .
+ IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
+
+ ///
+ /// Loads a WriteableBitmap implementation from a stream to a specified height maintaining aspect ratio.
+ ///
+ /// The stream to read the bitmap from.
+ /// The desired height of the resulting bitmap.
+ /// The to use should resizing be required.
+ /// An .
+ IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality);
+
+ ///
+ /// Loads a WriteableBitmap implementation from a file.
+ ///
+ /// The filename of the bitmap.
+ /// An .
+ IWriteableBitmapImpl LoadWriteableBitmap(string fileName);
+
+ ///
+ /// Loads a WriteableBitmap implementation from a file.
+ ///
+ /// The stream to read the bitmap from.
+ /// An .
+ IWriteableBitmapImpl LoadWriteableBitmap(Stream stream);
+
///
/// Loads a bitmap implementation from a stream to a specified width maintaining aspect ratio.
///
diff --git a/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs b/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
index 245888a351..354a344ffe 100644
--- a/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
+++ b/src/Avalonia.Visuals/Rendering/ICustomSimpleHitTest.cs
@@ -11,16 +11,13 @@ namespace Avalonia.Rendering
///
public interface ICustomSimpleHitTest
{
+ /// The point to hit test in global coordinate space.
bool HitTest(Point point);
}
///
/// Allows customization of hit-testing for all renderers.
///
- ///
- /// Note that this interface can only used to make a portion of a control non-hittable, it
- /// cannot expand the hittable area of a control.
- ///
public interface ICustomHitTest : ICustomSimpleHitTest
{
}
diff --git a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
index 9ea1b84311..85feb06c44 100644
--- a/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
+++ b/src/Avalonia.Visuals/Rendering/ImmediateRenderer.cs
@@ -225,7 +225,7 @@ namespace Avalonia.Rendering
if (filter?.Invoke(visual) != false)
{
- bool containsPoint = false;
+ bool containsPoint;
if (visual is ICustomSimpleHitTest custom)
{
diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
index 6a4c532d4a..36aa08c2f9 100644
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs
@@ -256,7 +256,8 @@ namespace Avalonia.Rendering.SceneGraph
if (childCount == 0 || wasVisited)
{
- if ((wasVisited || FilterAndClip(node, ref clip)) && node.HitTest(_point))
+ if ((wasVisited || FilterAndClip(node, ref clip)) &&
+ (node.Visual is ICustomSimpleHitTest custom ? custom.HitTest(_point) : node.HitTest(_point)))
{
_current = node.Visual;
@@ -311,8 +312,7 @@ namespace Avalonia.Rendering.SceneGraph
if (!clipped && node.Visual is ICustomHitTest custom)
{
- var controlPoint = _sceneRoot.Visual.TranslatePoint(_point, node.Visual);
- clipped = !custom.HitTest(controlPoint.Value);
+ clipped = !custom.HitTest(_point);
}
return !clipped;
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
index 6b7f0e11cf..7bc83ec85b 100644
--- a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
+++ b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -77,6 +77,31 @@ namespace Avalonia.Skia
return new ImmutableBitmap(stream);
}
+ public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ return new WriteableBitmapImpl(stream, width, true, interpolationMode);
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ return new WriteableBitmapImpl(stream, height, false, interpolationMode);
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(string fileName)
+ {
+ using (var stream = File.OpenRead(fileName))
+ {
+ return LoadWriteableBitmap(stream);
+ }
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(Stream stream)
+ {
+ return new WriteableBitmapImpl(stream);
+ }
+
///
public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
{
diff --git a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
index d48e7d10e6..63a1e8f869 100644
--- a/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
+++ b/src/Skia/Avalonia.Skia/WriteableBitmapImpl.cs
@@ -1,8 +1,10 @@
using System;
using System.IO;
using System.Threading;
+using Avalonia.Media.Imaging;
using Avalonia.Platform;
using Avalonia.Skia.Helpers;
+using Avalonia.Visuals.Media.Imaging;
using SkiaSharp;
namespace Avalonia.Skia
@@ -15,7 +17,70 @@ namespace Avalonia.Skia
private static readonly SKBitmapReleaseDelegate s_releaseDelegate = ReleaseProc;
private readonly SKBitmap _bitmap;
private readonly object _lock = new object();
+
+ ///
+ /// Create a WriteableBitmap from given stream.
+ ///
+ /// Stream containing encoded data.
+ public WriteableBitmapImpl(Stream stream)
+ {
+ using (var skiaStream = new SKManagedStream(stream))
+ {
+ _bitmap = SKBitmap.Decode(skiaStream);
+
+ if (_bitmap == null)
+ {
+ throw new ArgumentException("Unable to load bitmap from provided data");
+ }
+
+ PixelSize = new PixelSize(_bitmap.Width, _bitmap.Height);
+ Dpi = SkiaPlatform.DefaultDpi;
+ }
+ }
+
+ public WriteableBitmapImpl(Stream stream, int decodeSize, bool horizontal, BitmapInterpolationMode interpolationMode)
+ {
+ using (var skStream = new SKManagedStream(stream))
+ using (var codec = SKCodec.Create(skStream))
+ {
+ var info = codec.Info;
+ // get the scale that is nearest to what we want (eg: jpg returned 512)
+ var supportedScale = codec.GetScaledDimensions(horizontal ? ((float)decodeSize / info.Width) : ((float)decodeSize / info.Height));
+
+ // decode the bitmap at the nearest size
+ var nearest = new SKImageInfo(supportedScale.Width, supportedScale.Height);
+ var bmp = SKBitmap.Decode(codec, nearest);
+
+ // now scale that to the size that we want
+ var realScale = horizontal ? ((double)info.Height / info.Width) : ((double)info.Width / info.Height);
+
+ SKImageInfo desired;
+
+
+ if (horizontal)
+ {
+ desired = new SKImageInfo(decodeSize, (int)(realScale * decodeSize));
+ }
+ else
+ {
+ desired = new SKImageInfo((int)(realScale * decodeSize), decodeSize);
+ }
+
+ if (bmp.Width != desired.Width || bmp.Height != desired.Height)
+ {
+ var scaledBmp = bmp.Resize(desired, interpolationMode.ToSKFilterQuality());
+ bmp.Dispose();
+ bmp = scaledBmp;
+ }
+
+ _bitmap = bmp;
+
+ PixelSize = new PixelSize(bmp.Width, bmp.Height);
+ Dpi = SkiaPlatform.DefaultDpi;
+ }
+ }
+
///
/// Create new writeable bitmap.
///
diff --git a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
index 15685c0187..f50167b39a 100644
--- a/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
+++ b/src/Windows/Avalonia.Direct2D1/Direct2D1Platform.cs
@@ -188,6 +188,28 @@ namespace Avalonia.Direct2D1
return new WicBitmapImpl(stream);
}
+ public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ return new WriteableWicBitmapImpl(stream, width, true, interpolationMode);
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ return new WriteableWicBitmapImpl(stream, height, false, interpolationMode);
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(string fileName)
+ {
+ return new WriteableWicBitmapImpl(fileName);
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(Stream stream)
+ {
+ return new WriteableWicBitmapImpl(stream);
+ }
+
///
public IBitmapImpl LoadBitmapToWidth(Stream stream, int width, BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
{
diff --git a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
index 3261c45f15..fef6a9aa82 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/Imaging/WriteableWicBitmapImpl.cs
@@ -1,4 +1,5 @@
using System;
+using System.IO;
using Avalonia.Platform;
using SharpDX.WIC;
using PixelFormat = Avalonia.Platform.PixelFormat;
@@ -7,11 +8,27 @@ namespace Avalonia.Direct2D1.Media.Imaging
{
class WriteableWicBitmapImpl : WicBitmapImpl, IWriteableBitmapImpl
{
+ public WriteableWicBitmapImpl(Stream stream, int decodeSize, bool horizontal,
+ Avalonia.Visuals.Media.Imaging.BitmapInterpolationMode interpolationMode)
+ : base(stream, decodeSize, horizontal, interpolationMode)
+ {
+ }
+
public WriteableWicBitmapImpl(PixelSize size, Vector dpi, PixelFormat? pixelFormat, AlphaFormat? alphaFormat)
: base(size, dpi, pixelFormat, alphaFormat)
{
}
+ public WriteableWicBitmapImpl(Stream stream)
+ : base(stream)
+ {
+ }
+
+ public WriteableWicBitmapImpl(string fileName)
+ : base(fileName)
+ {
+ }
+
class LockedBitmap : ILockedFramebuffer
{
private readonly WriteableWicBitmapImpl _parent;
diff --git a/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs b/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
index 268977d662..8792cb5cb1 100644
--- a/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
+++ b/tests/Avalonia.Benchmarks/NullRenderingPlatform.cs
@@ -61,6 +61,28 @@ namespace Avalonia.Benchmarks
throw new NotImplementedException();
}
+ public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ throw new NotImplementedException();
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ throw new NotImplementedException();
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(string fileName)
+ {
+ throw new NotImplementedException();
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(Stream stream)
+ {
+ throw new NotImplementedException();
+ }
+
public IBitmapImpl LoadBitmap(PixelFormat format, AlphaFormat alphaFormat, IntPtr data, PixelSize size, Vector dpi, int stride)
{
throw new NotImplementedException();
diff --git a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
index 97af874238..9c2a1953f1 100644
--- a/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
+++ b/tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs
@@ -125,6 +125,27 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
}
}
+ [Fact]
+ public void Should_Produce_A_Single_Fallback_Run()
+ {
+ using (Start())
+ {
+ var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+
+ const string text = "👍 👍 👍 👍";
+
+ var textSource = new SingleBufferTextSource(text, defaultProperties);
+
+ var formatter = new TextFormatterImpl();
+
+ var textLine =
+ formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+ new GenericTextParagraphProperties(defaultProperties));
+
+ Assert.Equal(1, textLine.TextRuns.Count);
+ }
+ }
+
[Fact]
public void Should_Split_Run_On_Script()
{
diff --git a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
index 8015172e72..74366f9e26 100644
--- a/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
+++ b/tests/Avalonia.UnitTests/MockPlatformRenderInterface.cs
@@ -66,6 +66,28 @@ namespace Avalonia.UnitTests
return Mock.Of();
}
+ public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ throw new NotImplementedException();
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ throw new NotImplementedException();
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(string fileName)
+ {
+ throw new NotImplementedException();
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(Stream stream)
+ {
+ throw new NotImplementedException();
+ }
+
public IBitmapImpl LoadBitmap(string fileName)
{
return Mock.Of();
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/CustomHitTestBorder.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/CustomHitTestBorder.cs
new file mode 100644
index 0000000000..3221f097ad
--- /dev/null
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/CustomHitTestBorder.cs
@@ -0,0 +1,17 @@
+using Avalonia.Controls;
+using Avalonia.Media;
+using Avalonia.Rendering;
+
+namespace Avalonia.Visuals.UnitTests.Rendering
+{
+ internal class CustomHitTestBorder : Border, ICustomHitTest
+ {
+ public bool HitTest(Point point)
+ {
+ // Move hit testing window halfway to the left
+ return Bounds
+ .WithX(Bounds.X - Bounds.Width / 2)
+ .Contains(point);
+ }
+ }
+}
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
index 90b01e2ddb..d24d183709 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
@@ -1,6 +1,9 @@
-using System.Linq;
+using System;
+using System.Linq;
using Avalonia.Controls;
using Avalonia.Controls.Presenters;
+using Avalonia.Controls.Shapes;
+using Avalonia.Input;
using Avalonia.Layout;
using Avalonia.Media;
using Avalonia.Platform;
@@ -9,8 +12,6 @@ using Avalonia.UnitTests;
using Avalonia.VisualTree;
using Moq;
using Xunit;
-using System;
-using Avalonia.Controls.Shapes;
namespace Avalonia.Visuals.UnitTests.Rendering
{
@@ -501,6 +502,42 @@ namespace Avalonia.Visuals.UnitTests.Rendering
}
}
+ [Fact]
+ public void HitTest_Should_Accommodate_ICustomHitTest()
+ {
+ using (TestApplication())
+ {
+ Border border;
+
+ var root = new TestRoot
+ {
+ Width = 300,
+ Height = 200,
+ Child = border = new CustomHitTestBorder
+ {
+ Width = 100,
+ Height = 100,
+ Background = Brushes.Red,
+ HorizontalAlignment = HorizontalAlignment.Center,
+ VerticalAlignment = VerticalAlignment.Center
+ }
+ };
+
+ root.Renderer = new DeferredRenderer(root, null);
+ root.Measure(Size.Infinity);
+ root.Arrange(new Rect(root.DesiredSize));
+
+ var result = root.Renderer.HitTest(new Point(75, 100), root, null);
+ Assert.Equal(new[] { border }, result);
+
+ result = root.Renderer.HitTest(new Point(125, 100), root, null);
+ Assert.Equal(new[] { border }, result);
+
+ result = root.Renderer.HitTest(new Point(175, 100), root, null);
+ Assert.Empty(result);
+ }
+ }
+
private IDisposable TestApplication()
{
return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
index c4ef9d5ee7..a3b0a0cdd5 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/ImmediateRendererTests_HitTesting.cs
@@ -413,6 +413,43 @@ namespace Avalonia.Visuals.UnitTests.Rendering
}
}
+ [Fact]
+ public void HitTest_Should_Accommodate_ICustomHitTest()
+ {
+ using (TestApplication())
+ {
+ Border border;
+
+ var root = new TestRoot
+ {
+ Width = 300,
+ Height = 200,
+ Child = border = new CustomHitTestBorder
+ {
+ Width = 100,
+ Height = 100,
+ Background = Brushes.Red,
+ HorizontalAlignment = HorizontalAlignment.Center,
+ VerticalAlignment = VerticalAlignment.Center
+ }
+ };
+
+ root.Renderer = new ImmediateRenderer(root);
+ root.Measure(Size.Infinity);
+ root.Arrange(new Rect(root.DesiredSize));
+ root.Renderer.Paint(new Rect(root.ClientSize));
+
+ var result = root.Renderer.HitTest(new Point(75, 100), root, null).First();
+ Assert.Equal(border, result);
+
+ result = root.Renderer.HitTest(new Point(125, 100), root, null).First();
+ Assert.Equal(border, result);
+
+ result = root.Renderer.HitTest(new Point(175, 100), root, null).First();
+ Assert.Equal(root, result);
+ }
+ }
+
private IDisposable TestApplication()
{
return UnitTestApplication.Start(TestServices.MockPlatformRenderInterface);
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
index 1a6d003062..51ea1e893f 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
@@ -42,6 +42,28 @@ namespace Avalonia.Visuals.UnitTests.VisualTree
throw new NotImplementedException();
}
+ public IWriteableBitmapImpl LoadWriteableBitmapToWidth(Stream stream, int width,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ throw new NotImplementedException();
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmapToHeight(Stream stream, int height,
+ BitmapInterpolationMode interpolationMode = BitmapInterpolationMode.HighQuality)
+ {
+ throw new NotImplementedException();
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(string fileName)
+ {
+ throw new NotImplementedException();
+ }
+
+ public IWriteableBitmapImpl LoadWriteableBitmap(Stream stream)
+ {
+ throw new NotImplementedException();
+ }
+
public IBitmapImpl LoadBitmap(string fileName)
{
throw new NotImplementedException();