Add OnPlatformExtension.

samples/ControlCatalog.Blazor.Web/Properties/launchSettings.json

@@ -8,14 +8,6 @@
  }
  },
  "profiles": {
- "ControlCatalog.Web - IIS Express": {
- "commandName": "IISExpress",
- "launchBrowser": true,
- "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- },
  "ControlCatalog.Web": {
  "commandName": "Project",
  "dotnetRunMessages": "true",

samples/ControlCatalog.NetCore/ControlCatalog.NetCore.csproj

@@ -5,7 +5,7 @@
  <TargetFramework>net6.0</TargetFramework>
  <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <RuntimeFrameworkVersion>6.0.9</RuntimeFrameworkVersion>
+ <RuntimeFrameworkVersion>6.0.8</RuntimeFrameworkVersion>
  </PropertyGroup>
 
  <PropertyGroup Condition="'$(RunNativeAotCompilation)' == 'true'">

samples/ControlCatalog/MainView.xaml

@@ -12,8 +12,11 @@
  <Setter Property="HorizontalAlignment" Value="Left" />
  </Style>
  </Grid.Styles>
- <controls:HamburgerMenu Name="Sidebar">
- <TabItem Header="Composition">
+ <controls:HamburgerMenu Name="Sidebar">
+ <TabItem Header="Platform Information">
+ <pages:PlatformInfoPage />
+ </TabItem>
+ <TabItem Header="Composition">
  <pages:CompositionPage/>
  </TabItem>
  <TabItem Header="Acrylic">
@@ -118,7 +121,7 @@
  <TabItem Header="OpenGL">
  <pages:OpenGlPage />
  </TabItem>
- <TabItem Header="Pointers">
+  <TabItem Header="Pointers">
  <pages:PointersPage />
  </TabItem>
  <TabItem Header="ProgressBar">
@@ -130,7 +133,7 @@
  <TabItem Header="RelativePanel">
  <pages:RelativePanelPage />
  </TabItem>
- <TabItem Header="ScrollViewer">
+  <TabItem Header="ScrollViewer">
  <pages:ScrollViewerPage />
  </TabItem>
  <TabItem Header="Slider">

samples/ControlCatalog/Pages/PlatformInfoPage.xaml

@@ -0,0 +1,43 @@
+<UserControl x:Class="ControlCatalog.Pages.PlatformInfoPage"
+ xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ d:DesignHeight="800"
+ d:DesignWidth="400"
+ mc:Ignorable="d">
+ <StackPanel Spacing="20">
+ <TextBlock Text="{Binding PlatformInfo}" />
+
+ <StackPanel TextElement.Foreground="White">
+ <StackPanel Orientation="Horizontal">
+ <Border Height="100" Width="100" Background="{OnFormFactor Gray, Desktop=Green}">
+ <TextBlock Text="Desktop" />
+ </Border>
+ <Border Height="100" Width="100" Background="{OnFormFactor Gray, Mobile=Green}">
+ <TextBlock Text="Mobile" />
+ </Border>
+ </StackPanel>
+ <StackPanel Orientation="Horizontal">
+ <Border Height="100" Width="100" Background="{OnPlatform Gray, Windows=Green}">
+ <TextBlock Text="Windows" />
+ </Border>
+ <Border Height="100" Width="100" Background="{OnPlatform Gray, macOS=Green}">
+ <TextBlock Text="macOS" />
+ </Border>
+ <Border Height="100" Width="100" Background="{OnPlatform Gray, Linux=Green}">
+ <TextBlock Text="Linux" />
+ </Border>
+ <Border Height="100" Width="100" Background="{OnPlatform Gray, Browser=Green}">
+ <TextBlock Text="Browser" />
+ </Border>
+ <Border Height="100" Width="100" Background="{OnPlatform Gray, iOS=Green}">
+ <TextBlock Text="iOS" />
+ </Border>
+ <Border Height="100" Width="100" Background="{OnPlatform Gray, Android=Green}">
+ <TextBlock Text="Android" />
+ </Border>
+ </StackPanel>
+ </StackPanel>
+ </StackPanel>
+</UserControl>

samples/ControlCatalog/Pages/PlatformInfoPage.xaml.cs

@@ -0,0 +1,20 @@
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using ControlCatalog.ViewModels;
+
+namespace ControlCatalog.Pages
+{
+ public class PlatformInfoPage : UserControl
+ {
+ public PlatformInfoPage()
+ {
+ this.InitializeComponent();
+ DataContext = new PlatformInformationViewModel();
+ }
+
+ private void InitializeComponent()
+ {
+ AvaloniaXamlLoader.Load(this);
+ }
+ }
+}

samples/ControlCatalog/ViewModels/PlatformInformationViewModel.cs

@@ -0,0 +1,54 @@
+using Avalonia;
+using Avalonia.Platform;
+using MiniMvvm;
+
+namespace ControlCatalog.ViewModels;
+#nullable enable
+
+public class PlatformInformationViewModel : ViewModelBase
+{
+ public PlatformInformationViewModel()
+ {
+ var runtimeInfo = AvaloniaLocator.Current.GetService<IRuntimePlatform>()?.GetRuntimeInfo();
+
+ if (runtimeInfo is { } info)
+ {
+ if (info.IsBrowser)
+ {
+ if (info.IsDesktop)
+ {
+ PlatformInfo = "Platform: Desktop (browser)";
+ }
+ else if (info.IsMobile)
+ {
+ PlatformInfo = "Platform: Mobile (browser)";
+ }
+ else
+ {
+ PlatformInfo = "Platform: Unknown (browser) - please report";
+ }
+ }
+ else
+ {
+ if (info.IsDesktop)
+ {
+ PlatformInfo = "Platform: Desktop (native)";
+ }
+ else if (info.IsMobile)
+ {
+ PlatformInfo = "Platform: Mobile (native)";
+ }
+ else
+ {
+ PlatformInfo = "Platform: Unknown (native) - please report";
+ }
+ }
+ }
+ else
+ {
+
+ }
+ }
+
+ public string PlatformInfo { get; }
+}

src/Avalonia.Base/Platform/IRuntimePlatform.cs

@@ -17,13 +17,16 @@ public interface IUnmanagedBlob : IDisposable
  IntPtr Address { get; }
  int Size { get; }
  bool IsDisposed { get; }
- 
+
  }
 
  [Unstable]
  public struct RuntimePlatformInfo
  {
  public OperatingSystemType OperatingSystem { get; set; }
+
+ public FormFactorType FormFactor => IsDesktop ? FormFactorType.Desktop :
+ IsMobile ? FormFactorType.Mobile : FormFactorType.Unknown;
  public bool IsDesktop { get; set; }
  public bool IsMobile { get; set; }
  public bool IsBrowser { get; set; }
@@ -44,4 +47,12 @@ public enum OperatingSystemType
  iOS,
  Browser
  }
+
+ [Unstable]
+ public enum FormFactorType
+ {
+ Unknown,
+ Desktop,
+ Mobile
+ }
 }

src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AstNodes/AvaloniaXamlIlConditionalNode.cs

@@ -0,0 +1,82 @@
+using System.Collections.Generic;
+using System.Reflection.Emit;
+using XamlX.Ast;
+using XamlX.Emit;
+using XamlX.IL;
+
+namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions.Transformers;
+
+internal sealed class AvaloniaXamlIlConditionalNode : XamlAstNode,
+ IXamlAstEmitableNode<IXamlILEmitter, XamlILNodeEmitResult>, IXamlAstManipulationNode
+{
+ private readonly AvaloniaXamlIlConditionalDefaultNode? _defaultValue;
+ private readonly IReadOnlyList<AvaloniaXamlIlConditionalBranchNode> _branches;
+
+ public AvaloniaXamlIlConditionalNode(
+ AvaloniaXamlIlConditionalDefaultNode defaultValue,
+ IReadOnlyList<AvaloniaXamlIlConditionalBranchNode> values,
+ IXamlLineInfo info) : base(info)
+ {
+ _defaultValue = defaultValue;
+ _branches = values;
+ }
+
+ public override void VisitChildren(IXamlAstVisitor visitor)
+ {
+ _defaultValue?.VisitChildren(visitor);
+ foreach (var branch in _branches)
+ {
+ branch.VisitChildren(visitor);
+ }
+ }
+
+ public XamlILNodeEmitResult Emit(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context,
+ IXamlILEmitter codeGen)
+ {
+ var ret = codeGen.DefineLabel();
+
+ foreach (var platform in _branches)
+ {
+ var next = codeGen.DefineLabel();
+ platform.EmitCondition(context, codeGen);
+ codeGen.Brfalse(next);
+ platform.EmitBody(context, codeGen);
+ codeGen.Br(ret);
+ codeGen.MarkLabel(next);
+ }
+
+ if (_defaultValue is not null)
+ {
+ codeGen.Emit(OpCodes.Nop);
+ _defaultValue.EmitBody(context, codeGen);
+ }
+ else
+ {
+ codeGen.Pop();
+ }
+
+ codeGen.MarkLabel(ret);
+
+ return XamlILNodeEmitResult.Void(1);
+ }
+}
+
+internal abstract class AvaloniaXamlIlConditionalBranchNode : XamlAstNode, IXamlAstManipulationNode
+{
+ protected AvaloniaXamlIlConditionalBranchNode(IXamlLineInfo lineInfo) : base(lineInfo)
+ {
+ }
+
+ public abstract void EmitCondition(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen);
+
+ public abstract void EmitBody(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen);
+}
+
+internal abstract class AvaloniaXamlIlConditionalDefaultNode : XamlAstNode, IXamlAstManipulationNode
+{
+ protected AvaloniaXamlIlConditionalDefaultNode(IXamlLineInfo lineInfo) : base(lineInfo)
+ {
+ }
+
+ public abstract void EmitBody(XamlEmitContext<IXamlILEmitter, XamlILNodeEmitResult> context, IXamlILEmitter codeGen);
+}

src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlCompiler.cs

@@ -22,20 +22,20 @@ class AvaloniaXamlIlCompiler : XamlILCompiler
  private AvaloniaXamlIlCompiler(TransformerConfiguration configuration, XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> emitMappings)
  : base(configuration, emitMappings, true)
  {
- void InsertAfter<T>(params IXamlAstTransformer[] t) 
+ void InsertAfter<T>(params IXamlAstTransformer[] t)
  => Transformers.InsertRange(Transformers.FindIndex(x => x is T) + 1, t);
 
- void InsertBefore<T>(params IXamlAstTransformer[] t) 
+ void InsertBefore<T>(params IXamlAstTransformer[] t)
  => Transformers.InsertRange(Transformers.FindIndex(x => x is T), t);
 
 
  // Before everything else
- 
+
  Transformers.Insert(0, new XNameTransformer());
  Transformers.Insert(1, new IgnoredDirectivesTransformer());
  Transformers.Insert(2, _designTransformer = new AvaloniaXamlIlDesignPropertiesTransformer());
  Transformers.Insert(3, _bindingTransformer = new AvaloniaBindingExtensionTransformer());
- 
+
  // Targeted
  InsertBefore<PropertyReferenceResolver>(
  new AvaloniaXamlIlResolveClassesPropertiesTransformer(),
@@ -49,7 +49,7 @@ void InsertBefore<T>(params IXamlAstTransformer[] t)
  InsertBefore<ContentConvertTransformer>(
  new AvaloniaXamlIlControlThemeTransformer(),
  new AvaloniaXamlIlSelectorTransformer(),
- new AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer(), 
+ new AvaloniaXamlIlControlTemplateTargetTypeMetadataTransformer(),
  new AvaloniaXamlIlBindingPathParser(),
  new AvaloniaXamlIlPropertyPathTransformer(),
  new AvaloniaXamlIlSetterTargetTypeMetadataTransformer(),
@@ -58,6 +58,9 @@ void InsertBefore<T>(params IXamlAstTransformer[] t)
  new AvaloniaXamlIlTransitionsTypeMetadataTransformer(),
  new AvaloniaXamlIlResolveByNameMarkupExtensionReplacer()
  );
+ InsertAfter<ResolveContentPropertyTransformer>(
+ new AvaloniaXamlIlOnPlatformTransformer(),
+ new AvaloniaXamlIlOnFormFactorTransformer());
 
  InsertAfter<TypeReferenceResolver>(
  new XDataTypeTransformer());
@@ -89,14 +92,14 @@ public AvaloniaXamlIlCompiler(TransformerConfiguration configuration,
  _contextType = CreateContextType(contextTypeBuilder);
  }
 
- 
+
  public AvaloniaXamlIlCompiler(TransformerConfiguration configuration,
  XamlLanguageEmitMappings<IXamlILEmitter, XamlILNodeEmitResult> emitMappings,
  IXamlType contextType) : this(configuration, emitMappings)
  {
  _contextType = contextType;
  }
- 
+
  public const string PopulateName = "__AvaloniaXamlIlPopulate";
  public const string BuildName = "__AvaloniaXamlIlBuild";
 
@@ -118,7 +121,7 @@ public void ParseAndCompile(string xaml, string baseUri, IFileSource fileSource,
  {
  {XamlNamespaces.Blend2008, XamlNamespaces.Blend2008}
  });
- 
+
  var rootObject = (XamlAstObjectNode)parsed.Root;
 
  var classDirective = rootObject.Children
@@ -133,8 +136,8 @@ public void ParseAndCompile(string xaml, string baseUri, IFileSource fileSource,
  false) :
  TypeReferenceResolver.ResolveType(CreateTransformationContext(parsed, true),
  (XamlAstXmlTypeReference)rootObject.Type, true);
- 
- 
+
+
  if (overrideRootType != null)
  {
  if (!rootType.Type.IsAssignableFrom(overrideRootType))
@@ -147,7 +150,7 @@ public void ParseAndCompile(string xaml, string baseUri, IFileSource fileSource,
 
  Transform(parsed);
  Compile(parsed, tb, _contextType, PopulateName, BuildName, "__AvaloniaXamlIlNsInfo", baseUri, fileSource);
- 
+
  }
 
  public void OverrideRootType(XamlDocument doc, IXamlAstTypeReference newType)