11.2.1 trial

.github/workflows/pack.yml

@@ -25,6 +25,9 @@ jobs:
       - name: Nuget ReactiveUI Extension
         run: dotnet pack ./src/Ursa.ReactiveUIExtension -o ./nugets
 
+      - name: Publish NuGet package
+        run: dotnet nuget push "./nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+
       - name: Upload a Build Artifact
         uses: actions/[email protected]
         with:

.github/workflows/test.yml

@@ -0,0 +1,23 @@
+name: Test
+
+on:
+  push:
+    branches: [ "action/publish" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  windows:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+      - name: Ursa Headless Test
+        run: dotnet test ./tests/HeadlessTest.Ursa
+  ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+      - name: Ursa Headless Test
+        run: dotnet test ./tests/HeadlessTest.Ursa

demo/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.2.0</AvaloniaVersion>
+    <AvaloniaVersion>11.2.1</AvaloniaVersion>
   </PropertyGroup>
 </Project>

demo/Ursa.Demo/App.axaml

@@ -3,9 +3,29 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:semi="https://irihi.tech/semi"
-    xmlns:u-semi="https://irihi.tech/ursa/themes/semi">
+    xmlns:u-semi="https://irihi.tech/ursa/themes/semi"
+    xmlns:u="https://irihi.tech/ursa"
+    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
     <Application.Styles>
         <semi:SemiTheme Locale="zh-CN" />
         <u-semi:SemiTheme Locale="zh-CN" />
+        <!--This style is created to demonstrate Dialog StyleClass feature. This style is applied to Dialog Window-->
+        <Style Selector="u|DefaultDialogWindow.Custom">
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="Content" Value="CUSTOM"/>
+                <Setter Property="helpers:ClassHelper.Classes" Value="Warning"></Setter>
+            </Style>
+        </Style>
     </Application.Styles>
+    <Application.Resources>
+        <FontWeight x:Key="ButtonDefaultFontWeight">700</FontWeight>
+        <FontWeight x:Key="CalendarItemCalendarButtonSelectedFontWeight">700</FontWeight>
+        <FontWeight x:Key="ExpanderHeaderFontWeight">700</FontWeight>
+        <FontWeight x:Key="ListBoxItemRadioGroupButtonFontWeight">700</FontWeight>
+        <FontWeight x:Key="ProgressBarTextFontWeight">700</FontWeight>
+        <FontWeight x:Key="RadioButtonButtonFontWeight">700</FontWeight>
+        <FontWeight x:Key="TabItemSelectedFontWeight">700</FontWeight>
+        <FontWeight x:Key="TextBlockTitleFontWeight">700</FontWeight>
+        <FontWeight x:Key="ToggleButtonDefaultFontWeight">700</FontWeight>
+    </Application.Resources>
 </Application>

demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml

@@ -17,7 +17,10 @@
             <GradientStop Offset="0.9" Color="{DynamicResource SemiLightBlue1Color}" />
         </LinearGradientBrush>
     </UserControl.Background>
-    <Grid Margin="24" RowDefinitions="Auto, *, Auto" MinWidth="400">
+    <Grid
+        MinWidth="400"
+        Margin="24"
+        RowDefinitions="Auto, *, Auto">
         <TextBlock
             Grid.Row="0"
             Margin="8"
@@ -45,7 +48,10 @@
                 Grid.Column="1"
                 Margin="32,8,0,8"
                 Label="Owner">
-                <TextBox u:FormItem.Label="Owner" Text="{Binding Owner}" />
+                <TextBox
+                    u:FocusHelper.DialogFocusHint="True"
+                    u:FormItem.Label="Owner"
+                    Text="{Binding Owner}" />
             </u:FormItem>
             <u:FormItem
                 Grid.Row="1"
@@ -69,15 +75,26 @@
             HorizontalAlignment="Right"
             Orientation="Horizontal"
             Spacing="8">
-            <Button Command="{Binding DialogCommand}" Content="Dialog" Theme="{DynamicResource SolidButton}" />
-            <Button Command="{Binding OKCommand}" Content="OK" Theme="{DynamicResource SolidButton}" Classes="Tertiary"/>
-            <Button Command="{Binding CancelCommand}" Content="Cancel" Theme="{DynamicResource SolidButton}" Classes="Tertiary"/>
+            <Button
+                Command="{Binding DialogCommand}"
+                Content="Dialog"
+                Theme="{DynamicResource SolidButton}" />
+            <Button
+                Classes="Tertiary"
+                Command="{Binding OKCommand}"
+                Content="OK"
+                Theme="{DynamicResource SolidButton}" />
+            <Button
+                Classes="Tertiary"
+                Command="{Binding CancelCommand}"
+                Content="Cancel"
+                Theme="{DynamicResource SolidButton}" />
             <ComboBox>
                 <ComboBoxItem>A</ComboBoxItem>
                 <ComboBoxItem>B</ComboBoxItem>
                 <ComboBoxItem>C</ComboBoxItem>
             </ComboBox>
         </StackPanel>
     </Grid>
-    
+
 </UserControl>

demo/Ursa.Demo/Pages/AspectRatioLayoutDemo.axaml

@@ -0,0 +1,79 @@
+<UserControl 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"
+             xmlns:u="https://irihi.tech/ursa"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Ursa.Demo.Pages.AspectRatioLayoutDemo">
+    <Grid
+        RowDefinitions="Auto,*">
+        <StackPanel
+            Grid.Row="0">
+            <u:NumericDoubleUpDown InnerLeftContent="AspectRatioTolerance"
+                                   Value="{Binding  #AspectRatioLayout.AspectRatioTolerance}">
+            </u:NumericDoubleUpDown>
+            <TextBlock Text="{Binding #AspectRatioLayout.AspectRatioValue,StringFormat='AspectRatioValue: {0}'}"></TextBlock>
+        </StackPanel>
+
+        <u:AspectRatioLayout Name="AspectRatioLayout" Grid.Row="1"
+                             BorderThickness="1"
+                             BorderBrush="Red"
+                             Margin="2"
+                             CornerRadius="10">
+            <u:AspectRatioLayoutItem AcceptAspectRatioMode="HorizontalRectangle">
+                <Button>HorizontalRectangle ControlLayout</Button>
+            </u:AspectRatioLayoutItem>
+            <u:AspectRatioLayoutItem AcceptAspectRatioMode="VerticalRectangle">
+                <Button>VerticalRectangle ControlLayout</Button>
+            </u:AspectRatioLayoutItem>
+            <u:AspectRatioLayoutItem AcceptAspectRatioMode="Square">
+                <Button>Square ControlLayout</Button>
+            </u:AspectRatioLayoutItem>
+            <u:AspectRatioLayoutItem StartAspectRatioValue="2" EndAspectRatioValue="2.2">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+                    <Run Text="{Binding $parent[u:AspectRatioLayoutItem].StartAspectRatioValue,StringFormat='StartAspectRatioValue {0}'}"></Run>
+                    <LineBreak></LineBreak>
+                    <Run Text="{Binding $parent[u:AspectRatioLayoutItem].EndAspectRatioValue,StringFormat='EndAspectRatioValue {0}'}"></Run>
+                </TextBlock>
+            </u:AspectRatioLayoutItem>
+            <u:AspectRatioLayoutItem StartAspectRatioValue="2" EndAspectRatioValue="2.4">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+                    <Run Text="{Binding $parent[u:AspectRatioLayoutItem].StartAspectRatioValue,StringFormat='StartAspectRatioValue {0}'}"></Run>
+                    <LineBreak></LineBreak>
+                    <Run Text="{Binding $parent[u:AspectRatioLayoutItem].EndAspectRatioValue,StringFormat='EndAspectRatioValue {0}'}"></Run>
+                </TextBlock>
+            </u:AspectRatioLayoutItem> 
+            <u:AspectRatioLayoutItem StartAspectRatioValue="2" EndAspectRatioValue="2.6">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+                    <Run Text="{Binding $parent[u:AspectRatioLayoutItem].StartAspectRatioValue,StringFormat='StartAspectRatioValue {0}'}"></Run>
+                    <LineBreak></LineBreak>
+                    <Run Text="{Binding $parent[u:AspectRatioLayoutItem].EndAspectRatioValue,StringFormat='EndAspectRatioValue {0}'}"></Run>
+                </TextBlock>
+            </u:AspectRatioLayoutItem> 
+            <u:AspectRatioLayoutItem StartAspectRatioValue="2" EndAspectRatioValue="2.8">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+                    <Run Text="{Binding $parent[u:AspectRatioLayoutItem].StartAspectRatioValue,StringFormat='StartAspectRatioValue {0}'}"></Run>
+                    <LineBreak></LineBreak>
+                    <Run Text="{Binding $parent[u:AspectRatioLayoutItem].EndAspectRatioValue,StringFormat='EndAspectRatioValue {0}'}"></Run>
+                </TextBlock>
+            </u:AspectRatioLayoutItem> 
+            <u:AspectRatioLayoutItem StartAspectRatioValue="1.3" EndAspectRatioValue="1.5">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+                    <Run Text="{Binding $parent[u:AspectRatioLayoutItem].StartAspectRatioValue,StringFormat='StartAspectRatioValue {0}'}"></Run>
+                    <LineBreak></LineBreak>
+                    <Run Text="{Binding $parent[u:AspectRatioLayoutItem].EndAspectRatioValue,StringFormat='EndAspectRatioValue {0}'}"></Run>
+                </TextBlock>
+            </u:AspectRatioLayoutItem>
+        </u:AspectRatioLayout>
+    </Grid>
+</UserControl>

demo/Ursa.Demo/Pages/AspectRatioLayoutDemo.axaml.cs

@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Ursa.Demo.Pages;
+
+public partial class AspectRatioLayoutDemo : UserControl
+{
+    public AspectRatioLayoutDemo()
+    {
+        InitializeComponent();
+    }
+}

demo/Ursa.Demo/Pages/DialogDemo.axaml

@@ -51,6 +51,21 @@
                         IsThreeState="True" />
                     <CheckBox u:FormItem.Label="CanDragMove" IsChecked="{Binding CanDragMove}" />
                     <CheckBox u:FormItem.Label="CanResize" IsChecked="{Binding CanResize}" />
+                    <u:FormItem>
+                        <u:FormItem.Label>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="Style Class" />
+                                <PathIcon
+                                    Width="12"
+                                    Height="12"
+                                    VerticalAlignment="Center"
+                                    TextElement.FontWeight="Normal"
+                                    Data="{DynamicResource DialogQuestionIconGlyph}"
+                                    ToolTip.Tip="Pass a Style Class to the created Dialog. In this example, if you set StyleClass as 'Custom', You will get Special Style for OK Button. These styles usually are defined in the root of your App/Window" />
+                            </StackPanel>
+                        </u:FormItem.Label>
+                        <TextBox HorizontalAlignment="Stretch" Text="{Binding StyleClass}" />
+                    </u:FormItem>
                     <Button
                         HorizontalAlignment="Left"
                         u:FormItem.NoLabel="True"
@@ -128,6 +143,21 @@
                         IsChecked="{Binding IsLocal}"
                         OffContent="Global"
                         OnContent="Local" />
+                    <u:FormItem>
+                        <u:FormItem.Label>
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock Text="Style Class" />
+                                <PathIcon
+                                    Width="12"
+                                    Height="12"
+                                    VerticalAlignment="Center"
+                                    TextElement.FontWeight="Normal"
+                                    Data="{DynamicResource DialogQuestionIconGlyph}"
+                                    ToolTip.Tip="Pass a Style Class to the created Dialog. In this example, if you set StyleClass as 'Custom', You will get Special Style for OK Button. These styles usually are defined in the root of your App/Window" />
+                            </StackPanel>
+                        </u:FormItem.Label>
+                        <TextBox HorizontalAlignment="Stretch" Text="{Binding StyleClass}" />
+                    </u:FormItem>
                     <Button
                         HorizontalAlignment="Left"
                         u:FormItem.NoLabel="True"

demo/Ursa.Demo/ViewModels/AspectRatioLayoutDemoViewModel.cs

@@ -0,0 +1,5 @@
+namespace Ursa.Demo.ViewModels;
+
+public class AspectRatioLayoutDemoViewModel : ViewModelBase
+{
+}

demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs

@@ -33,6 +33,7 @@ public partial class DefaultWindowDialogDemoViewModel: ObservableObject
     [ObservableProperty] private bool? _isCloseButtonVisible;
     [ObservableProperty] private bool _canDragMove;
     [ObservableProperty] private bool _canResize;
+    [ObservableProperty] private string? _styleClass;
 
     public ICommand ShowDialogCommand { get; }
 
@@ -57,6 +58,7 @@ private async Task ShowDialog()
             StartupLocation = Location,
             CanDragMove = CanDragMove,
             CanResize = CanResize,
+            StyleClass = StyleClass,
         };
         if (X.HasValue && Y.HasValue)
         {
@@ -133,6 +135,7 @@ public partial class DefaultOverlayDialogDemoViewModel : ObservableObject
     [ObservableProperty] private bool _isModal;
     [ObservableProperty] private bool _isLocal;
     [ObservableProperty] private bool _canResize;
+    [ObservableProperty] private string? _styleClass;
 
     public ICommand ShowDialogCommand { get; }
 
@@ -163,6 +166,7 @@ private async Task ShowDialog()
             CanDragMove = CanDragMove,
             IsCloseButtonVisible = IsCloseButtonVisible,
             CanResize = CanResize,
+            StyleClass = StyleClass,
         };
         string? dialogHostId = IsLocal ? DialogDemoViewModel.LocalHost : null;
         if (IsModal)

demo/Ursa.Demo/ViewModels/MainViewViewModel.cs

@@ -77,6 +77,7 @@ private void OnNavigation(MainViewViewModel vm, string s)
             MenuKeys.MenuKeyToolBar => new ToolBarDemoViewModel(),
             MenuKeys.MenuKeyTreeComboBox => new TreeComboBoxDemoViewModel(),
             MenuKeys.MenuKeyTwoTonePathIcon => new TwoTonePathIconDemoViewModel(),
+            MenuKeys.AspectRatioLayout => new AspectRatioLayoutDemoViewModel(),
             _ => throw new ArgumentOutOfRangeException(nameof(s), s, null)
         };
     }

demo/Ursa.Demo/ViewModels/MenuViewModel.cs

@@ -58,6 +58,7 @@ public MenuViewModel()
             new() { MenuHeader = "ToolBar", Key = MenuKeys.MenuKeyToolBar },
             new() { MenuHeader = "TreeComboBox", Key = MenuKeys.MenuKeyTreeComboBox },
             new() { MenuHeader = "TwoTonePathIcon", Key = MenuKeys.MenuKeyTwoTonePathIcon },
+            new() { MenuHeader = "AspectRatioLayout", Key = MenuKeys.AspectRatioLayout ,Status = "WIP"},
         };
     }
 }
@@ -111,4 +112,5 @@ public static class MenuKeys
     public const string MenuKeyToolBar = "ToolBar";
     public const string MenuKeyTreeComboBox = "TreeComboBox";
     public const string MenuKeyTwoTonePathIcon = "TwoTonePathIcon";
+    public const string AspectRatioLayout = "AspectRatioLayout";
 }

demo/Ursa.Demo/Views/MainWindow.axaml

@@ -3,21 +3,31 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:views="clr-namespace:Ursa.Demo.Views"
     xmlns:u="https://irihi.tech/ursa"
     xmlns:viewModels="clr-namespace:Ursa.Demo.ViewModels"
+    xmlns:views="clr-namespace:Ursa.Demo.Views"
     Title="Ursa.Demo"
     d:DesignHeight="450"
     d:DesignWidth="800"
     x:CompileBindings="True"
-    IsFullScreenButtonVisible="{OnPlatform True, macOS=False}"
-    IsManagedResizerVisible="{OnPlatform False, Linux=True}"
     x:DataType="viewModels:MainWindowViewModel"
     Icon="/Assets/Ursa.ico"
+    IsFullScreenButtonVisible="{OnPlatform True, macOS=False}"
+    IsManagedResizerVisible="{OnPlatform False, Linux=True}"
     mc:Ignorable="d">
     <u:UrsaWindow.RightContent>
-        <views:TitleBarRightContent/>        
+        <views:TitleBarRightContent />
     </u:UrsaWindow.RightContent>
+    <u:UrsaWindow.Styles>
+        <!--This style is created to demonstrate Dialog StyleClass feature. This style is applied to dialogs in MainWindow OverlayDialogHost -->
+        <Style Selector="u|DefaultDialogControl.Custom">
+            <Style Selector="^ /template/ Button#PART_OKButton">
+                <Setter Property="Content" Value="CUSTOM" />
+                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
+            </Style>
+        </Style>
+    </u:UrsaWindow.Styles>
     <views:MainView />
 </u:UrsaWindow>

global.json

@@ -2,6 +2,6 @@
   "sdk": {
     "version": "8.0.0",
     "rollForward": "latestMajor",
-    "allowPrerelease": false
+    "allowPrerelease": true
   }
 }

src/Package.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
-        <Version>1.5.0</Version>
-        <AvaloniaVersion>11.1.4</AvaloniaVersion>
+        <Version>1.5.0.1</Version>
+        <AvaloniaVersion>11.1.1</AvaloniaVersion>
         <Authors>IRIHI Technology Co., Ltd.</Authors>
         <RepositoryUrl>https://github.com/irihitech/Ursa.Avalonia</RepositoryUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>