feat: change render mode in browser demo.

2026-03-03 00:00:55 +08:00 · 2024-09-01 17:00:26 +08:00
17 changed files with 80 additions and 162 deletions
--- a/.github/workflows/pack.yml
+++ b/.github/workflows/pack.yml
@@ -1,4 +1,4 @@
-name: Pack Nuget
+name: Pack

 on:
  push:
@@ -7,8 +7,8 @@ on:
    branches: [ "action/pack" ]

 jobs:
-  nuget:
-    runs-on: ubuntu-latest
+  nuget_desktop:
+    runs-on: windows-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v4.1.1
@@ -25,8 +25,34 @@ jobs:
      - name: Nuget Semi.Avalonia.TreeDataGrid
        run: dotnet pack ./src/Semi.Avalonia.TreeDataGrid  -o ./nugets

+      - name: Desktop
+        run: dotnet publish ./demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true --self-contained true
+
      - name: Upload a Build Artifact
        uses: actions/upload-artifact@v4.3.1
        with:
-          name: nugets
-          path: ./nugets
+          name: nuget_desktop
+          path: |
+            ./nugets
+            ./**/publish/*.exe
+
+  android:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+
+      - name: CD Android
+        run: cd ./demo/Semi.Avalonia.Demo.Android
+
+      - name: Restore Dependencies
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet publish ./demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4.3.1
+        with:
+          name: android
+          path: ./**/publish/*Signed.apk
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,92 +0,0 @@
-name: Publish Demo
-
-on:
-  push:
-    branches: [ "action/publish" ]
-  pull_request:
-    branches: [ "action/publish" ]
-
-jobs:
-  windows:
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-
-      - name: Make upload directory
-        run: mkdir upload
-
-      - name: Publish win-x64
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/win64
-
-      - name: Zip win-x64
-        run: |
-          $files = Get-ChildItem -Path ./publish/win64/* -Recurse -Exclude *.pdb
-          Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.zip
-
-      - name: Enable Native AOT in .csproj
-        run: |
-          sed -i 's#<!--<PublishAot>true</PublishAot>-->#<PublishAot>true</PublishAot>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
-          sed -i 's#<!--<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>-->#<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
-
-      - name: Publish win-x64 AOT
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o ./publish/win64-aot
-
-      - name: Zip win-x64 AOT
-        run: |
-          $files = Get-ChildItem -Path ./publish/win64-aot/* -Recurse -Exclude *.pdb
-          Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip
-
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.3.1
-        with:
-          name: windows
-          path: ./upload
-
-  linux:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-
-      - name: Make upload directory
-        run: mkdir upload
-
-      - name: Publish linux-x64
-        run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/linux64
-
-      - name: Zip linux-x64
-        run: zip -j -r ./upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip ./publish/linux64 -x "*.pdb"
-
-      - name: Publish linux-x64 DRM
-        run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/drm
-
-      - name: Zip linux-x64 DRM
-        run: zip -j -r ./upload/Semi.Avalonia.Demo.Drm.linux-x64.zip ./publish/drm -x "*.pdb"
-
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.3.1
-        with:
-          name: linux
-          path: ./upload
-
-  android:
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-
-      - name: CD Android
-        run: cd ./demo/Semi.Avalonia.Demo.Android
-
-      - name: Restore Dependencies
-        run: dotnet restore
-
-      - name: Publish Android
-        run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o ./publish
-
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4.3.1
-        with:
-          name: android
-          path: ./publish/*Signed.apk
--- a/README.md
+++ b/README.md
@@ -26,13 +26,11 @@ dotnet add package Semi.Avalonia
 Include Semi Design Styles in application:

 ```xaml
-<Application
-    ...
-    xmlns:semi="https://irihi.tech/semi">
-    <Application.Styles>
-        <semi:SemiTheme Locale="zh-CN" />
-    </Application.Styles>
-</Application>
+<Application.Styles>
+<!-- You can still reference in old way.  -->
+<!-- <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" /> -->
+    <semi:SemiTheme Locale="zh-cn" />
+</Application.Styles>
 ```

 That's all.
--- a/README_CN.md
+++ b/README_CN.md
@@ -26,13 +26,11 @@ dotnet add package Semi.Avalonia
 在样式中引用 Semi 主题：

 ```xaml
-<Application
-    ...
-    xmlns:semi="https://irihi.tech/semi">
-    <Application.Styles>
-        <semi:SemiTheme Locale="zh-CN" />
-    </Application.Styles>
-</Application>
+<Application.Styles>
+<!-- 您仍然可以使用旧版方式引用  -->
+<!-- <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" /> -->
+    <semi:SemiTheme Locale="zh-cn" />
+</Application.Styles>
 ```

 这样就可以了。
--- a/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
+++ b/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
@@ -5,8 +5,10 @@
        <Nullable>enable</Nullable>
        <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
        <!-- Uncomment below to enable Native AOT compilation-->
-        <!--<PublishAot>true</PublishAot>-->
-        <!--<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>-->
+        <!--
+        <PublishAot>true</PublishAot>
+        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+        -->
    </PropertyGroup>

    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
--- a/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj
+++ b/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj
@@ -5,8 +5,10 @@
        <Nullable>enable</Nullable>
        <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
        <!-- Uncomment below to enable Native AOT compilation-->
-        <!--<PublishAot>true</PublishAot>-->
-        <!--<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>-->
+        <!--
+        <PublishAot>true</PublishAot>
+        <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+        -->
    </PropertyGroup>

    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
--- a/demo/Semi.Avalonia.Demo.Web/Program.cs
+++ b/demo/Semi.Avalonia.Demo.Web/Program.cs
@@ -11,7 +11,10 @@ internal sealed partial class Program
 {
    private static Task Main(string[] args) => BuildAvaloniaApp()
        .WithSourceHanSansCNFont()
-        .StartBrowserAppAsync("out");
+        .StartBrowserAppAsync("out", new BrowserPlatformOptions
+        {
+            RenderingMode = [ BrowserRenderingMode.WebGL2, BrowserRenderingMode.WebGL1, BrowserRenderingMode.Software2D],
+        });

    public static AppBuilder BuildAvaloniaApp()
        => AppBuilder.Configure<App>();
--- a/demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/NotificationDemo.axaml
@@ -8,7 +8,7 @@
    d:DesignWidth="800"
    mc:Ignorable="d">
    <StackPanel Spacing="20">
-        <UniformGrid Rows="2" Columns="3" Width="500" HorizontalAlignment="Left">
+        <UniformGrid Rows="3" Columns="3" Width="500" HorizontalAlignment="Left">
            <UniformGrid.Styles>
                <Style Selector="RadioButton">
                    <Setter Property="Theme" Value="{DynamicResource PureCardRadioButton}" />
--- a/src/Package.props
+++ b/src/Package.props
@@ -3,7 +3,7 @@
        <TargetFrameworks>net6.0;net8.0;netstandard2.0</TargetFrameworks>
        <Nullable>enable</Nullable>
        <LangVersion>latest</LangVersion>
-        <Version>11.1.0.4</Version>
+        <Version>11.1.0.3</Version>
        <Authors>IRIHI Technology Co., Ltd.</Authors>
        <Description>Avalonia Theme inspired by Semi Design.</Description>
        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
--- a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
+++ b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
@@ -4,7 +4,7 @@

    <PropertyGroup>
        <Title>Semi.Avalonia.ColorPicker</Title>
-        <PackageReleaseNotes>Update to Avalonia 11.1.0.4</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1.0.3</PackageReleaseNotes>
    </PropertyGroup>

    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
--- a/src/Semi.Avalonia.DataGrid/Light.axaml
+++ b/src/Semi.Avalonia.DataGrid/Light.axaml
@@ -18,8 +18,8 @@
    <SolidColorBrush x:Key="DataGridDetailsPresenterBackground" Color="Transparent" />

    <SolidColorBrush x:Key="DataGridRowPointeroverBackground" Opacity="0.09" Color="#2E3238" />
-    <SolidColorBrush x:Key="DataGridRowSelectedBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="DataGridRowSelectedPointeroverBackground" Color="#CBE7FE" />
+    <SolidColorBrush x:Key="DataGridRowSelectedBackground" Opacity="0.2" Color="#EAF5FF" />
+    <SolidColorBrush x:Key="DataGridRowSelectedPointeroverBackground" Opacity="0.3" Color="#CBE7FE" />
    <SolidColorBrush x:Key="DataGridRowGroupHeaderExpandIconForeground" Opacity="0.62" Color="#1C1F23" />
    <SolidColorBrush x:Key="DataGridRowGroupHeaderBackground" Opacity="0.05" Color="#2E3238" />

--- a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
+++ b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
@@ -4,7 +4,7 @@
    
    <PropertyGroup>
        <Title>Semi.Avalonia.DataGrid</Title>
-        <PackageReleaseNotes>Update to Avalonia 11.1.0.4</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1.0.3</PackageReleaseNotes>
    </PropertyGroup>

    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
--- a/src/Semi.Avalonia/Controls/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Controls/NotificationCard.axaml
@@ -5,17 +5,16 @@
    <Design.PreviewWith>
        <ThemeVariantScope RequestedThemeVariant="Dark">
            <StackPanel>
-                <NotificationCard />
                <NotificationCard>
                    Hello, Semi.Avalonia!
                </NotificationCard>
                <NotificationCard NotificationType="Success">
                    <Notification Title="Welcome" Message="Hello, Semi.Avalonia!" />
                </NotificationCard>
-                <NotificationCard NotificationType="Warning" Classes="Light">
-                    <Notification Title="Welcome" />
+                <NotificationCard NotificationType="Warning">
+                    <Notification Title="" Message="Hello, Semi.Avalonia!" />
                </NotificationCard>
-                <NotificationCard NotificationType="Error" Classes="Light">
+                <NotificationCard NotificationType="Error">
                    <Notification Message="Hello, Semi.Avalonia!" />
                </NotificationCard>
            </StackPanel>
@@ -23,7 +22,10 @@
    </Design.PreviewWith>
    <ControlTheme x:Key="{x:Type NotificationCard}" TargetType="NotificationCard">
        <Setter Property="UseLayoutRounding" Value="True" />
+        <Setter Property="MinWidth" Value="{DynamicResource NotificationCardMinWidth}" />
+        <Setter Property="RenderTransformOrigin" Value="50%,75%" />
        <Setter Property="BorderThickness" Value="{DynamicResource NotificationCardBorderThickness}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource NotificationCardBorderBrush}" />
        <Setter Property="Background" Value="{DynamicResource NotificationCardBackground}" />
        <Setter Property="CornerRadius" Value="{DynamicResource NotificationCardCornerRadius}" />
        <Setter Property="Template">
@@ -36,11 +38,11 @@
                        <Border
                            x:Name="PART_RootBorder"
                            Padding="{DynamicResource NotificationCardPadding}"
-                            BoxShadow="{DynamicResource NotificationCardBoxShadows}"
+                            BoxShadow="{DynamicResource NotificationCardBoxShadow}"
                            BorderBrush="{TemplateBinding BorderBrush}"
                            BorderThickness="{TemplateBinding BorderThickness}"
                            CornerRadius="{TemplateBinding CornerRadius}">
-                            <DockPanel MinWidth="{DynamicResource NotificationCardMinWidth}">
+                            <DockPanel>
                                <PathIcon
                                    Name="NotificationIcon"
                                    Width="{DynamicResource NotificationCardIconWidth}"
@@ -65,7 +67,6 @@
                                                    Foreground="{DynamicResource NotificationCardMessageForeground}"
                                                    FontSize="{DynamicResource NotificationCardMessageFontSize}"
                                                    FontWeight="{DynamicResource NotificationCardMessageFontWeight}"
-                                                    IsVisible="{Binding Message, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                                                    Text="{Binding Message}"
                                                    TextWrapping="Wrap" />
                                            </StackPanel>
@@ -168,22 +169,22 @@
        </Style>

        <Style Selector="^.Light">
-            <Setter Property="Background" Value="{DynamicResource NotificationCardLightBackground}" />
+            <Setter Property="Background" Value="{DynamicResource SemiColorBackground0}" />
            <Style Selector="^:information /template/ Border#PART_RootBorder">
-                <Setter Property="BorderBrush" Value="{DynamicResource NotificationCardLightInformationBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource NotificationCardLightInformationBackground}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorInformation}" />
+                <Setter Property="Background" Value="{DynamicResource SemiColorInformationLight}" />
            </Style>
            <Style Selector="^:success /template/ Border#PART_RootBorder">
-                <Setter Property="BorderBrush" Value="{DynamicResource NotificationCardLightSuccessBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource NotificationCardLightSuccessBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorSuccess}" />
+                <Setter Property="Background" Value="{DynamicResource SemiColorSuccessLight}" />
            </Style>
            <Style Selector="^:warning /template/ Border#PART_RootBorder">
-                <Setter Property="BorderBrush" Value="{DynamicResource NotificationCardLightWarningBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource NotificationCardLightWarningBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorWarning}" />
+                <Setter Property="Background" Value="{DynamicResource SemiColorWarningLight}" />
            </Style>
            <Style Selector="^:error /template/ Border#PART_RootBorder">
-                <Setter Property="BorderBrush" Value="{DynamicResource NotificationCardLightErrorBorderBrush}" />
-                <Setter Property="Background" Value="{DynamicResource NotificationCardLightErrorBackground}" />
+                <Setter Property="BorderBrush" Value="{DynamicResource SemiColorDanger}" />
+                <Setter Property="Background" Value="{DynamicResource SemiColorDangerLight}" />
            </Style>
        </Style>
    </ControlTheme>
--- a/src/Semi.Avalonia/Semi.Avalonia.csproj
+++ b/src/Semi.Avalonia/Semi.Avalonia.csproj
@@ -4,7 +4,7 @@

    <PropertyGroup>
        <Title>Semi.Avalonia</Title>
-        <PackageReleaseNotes>Update to Avalonia 11.1.0.4</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1.0.3</PackageReleaseNotes>
    </PropertyGroup>

    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
--- a/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/NotificationCard.axaml
@@ -5,17 +5,7 @@
    <SolidColorBrush x:Key="NotificationCardSuccessIconForeground" Color="#5DC264" />
    <SolidColorBrush x:Key="NotificationCardWarningIconForeground" Color="#FFAE43" />
    <SolidColorBrush x:Key="NotificationCardErrorIconForeground" Color="#FC725A" />
-    <BoxShadows x:Key="NotificationCardBoxShadows">inset 0 0 0 1 #1AFFFFFF, 0 4 14 0 #40000000</BoxShadows>
+    <BoxShadows x:Key="NotificationCardBoxShadows">0 0 8 0 #1AFFFFFF</BoxShadows>
    <SolidColorBrush x:Key="NotificationCardTitleForeground" Color="#F9F9F9" />
    <SolidColorBrush x:Key="NotificationCardMessageForeground" Opacity="0.8" Color="#F9F9F9" />
-    
-    <SolidColorBrush x:Key="NotificationCardLightBackground" Color="#16161A" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBorderBrush" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBackground" Opacity="0.2" Color="#54A9FF" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBorderBrush" Color="#5DC264" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBackground" Opacity="0.2" Color="#5DC264" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBorderBrush" Color="#FFAE43" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBackground" Opacity="0.2" Color="#FFAE43" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBorderBrush" Color="#FC725A" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBackground" Opacity="0.2" Color="#FC725A" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Light/NotificationCard.axaml
@@ -5,17 +5,7 @@
    <SolidColorBrush x:Key="NotificationCardSuccessIconForeground" Color="#3BB346" />
    <SolidColorBrush x:Key="NotificationCardWarningIconForeground" Color="#FC8800" />
    <SolidColorBrush x:Key="NotificationCardErrorIconForeground" Color="#F93920" />
-    <BoxShadows x:Key="NotificationCardBoxShadows">0 0 1 0 #4A000000, 0 4 14 0 #1A000000</BoxShadows>
+    <BoxShadows x:Key="NotificationCardBoxShadows">0 0 8 0 #1A000000</BoxShadows>
    <SolidColorBrush x:Key="NotificationCardTitleForeground" Color="#1C1F23" />
    <SolidColorBrush x:Key="NotificationCardMessageForeground" Opacity="0.8" Color="#1C1F23" />
-
-    <SolidColorBrush x:Key="NotificationCardLightBackground" Color="White" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBorderBrush" Color="#0077FA" />
-    <SolidColorBrush x:Key="NotificationCardLightInformationBackground" Color="#EAF5FF" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBorderBrush" Color="#3BB346" />
-    <SolidColorBrush x:Key="NotificationCardLightSuccessBackground" Color="#ECF7EC" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBorderBrush" Color="#FC8800" />
-    <SolidColorBrush x:Key="NotificationCardLightWarningBackground" Color="#FFF8EA" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBorderBrush" Color="#F93920" />
-    <SolidColorBrush x:Key="NotificationCardLightErrorBackground" Color="#FEF2ED" />
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/NotificationCard.axaml
@@ -3,7 +3,7 @@
    <Thickness x:Key="NotificationCardBorderThickness">1</Thickness>
    <CornerRadius x:Key="NotificationCardCornerRadius">6</CornerRadius>
    <Thickness x:Key="NotificationCardMargin">8</Thickness>
-    <Thickness x:Key="NotificationCardPadding">20 16 12 16</Thickness>
+    <Thickness x:Key="NotificationCardPadding">16 12</Thickness>

    <x:Double x:Key="NotificationCardIconWidth">18</x:Double>
    <x:Double x:Key="NotificationCardIconHeight">18</x:Double>