Implement PlaceholderText (#727 )

* feat: replace Watermark with PlaceholderText in AutoCompleteBox and related controls * fix: remove duplicate PlaceholderForeground setter.
adjust CornerRadius & MinWidth for SplitButton (#725 )
2026-04-06 01:06:36 +08:00 · 2026-02-09 15:00:07 +08:00 · 2026-02-07 16:51:27 +08:00 · 2026-02-06 23:09:13 +08:00 · 2026-02-06 21:50:08 +08:00 · 2026-02-06 21:40:49 +08:00
32 changed files with 249 additions and 325 deletions
--- a/Nuget.Config
+++ b/Nuget.Config
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <packageSources>
-        <add key="avalonia-nightly" value="https://nuget-feed-nightly.avaloniaui.net/v3/index.json" />
-    </packageSources>
-</configuration>
--- a/demo/Directory.Packages.props
+++ b/demo/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
    <PropertyGroup>
        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersion>12.0.0-preview2</AvaloniaVersion>
+        <AvaloniaVersion>12.0.999-cibuild0061987-alpha</AvaloniaVersion>
        <DataGridVersion>11.3.10</DataGridVersion>
        <SkiaSharpVersion>3.119.1</SkiaSharpVersion>
    </PropertyGroup>
--- a/demo/Semi.Avalonia.Demo/App.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/App.axaml.cs
@@ -22,7 +22,7 @@ public partial class App : Application
            case IClassicDesktopStyleApplicationLifetime desktop:
                // Line below is needed to remove Avalonia data validation.
                // Without this line you will get duplicate validations from both Avalonia and CT
-                // BindingPlugins.DataValidators.RemoveAt(0);
+                BindingPlugins.DataValidators.RemoveAt(0);
                desktop.MainWindow = new MainWindow();
                break;
            case ISingleViewApplicationLifetime singleView:
--- a/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/SliderDemo.axaml
@@ -22,15 +22,6 @@
            TickFrequency="10"
            TickPlacement="Outside"
            Value="0" />
-        <Slider
-            Value="0"
-            Minimum="0"
-            Maximum="100"
-            TickPlacement="BottomRight"
-            IsSnapToTickEnabled="True"
-            IsDirectionReversed="True"
-            Ticks="0,20,25,40,75,100"
-            Width="300" />
        <Slider
            Width="300"
            Classes="ToolTip"
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -1,7 +1,7 @@
 <Project>
    <PropertyGroup>
        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <AvaloniaVersion>12.0.0-preview2</AvaloniaVersion>
+        <AvaloniaVersion>12.0.999-cibuild0061987-alpha</AvaloniaVersion>
        <DataGridVersion>11.3.7</DataGridVersion>
    </PropertyGroup>
    <ItemGroup>
@@ -9,6 +9,6 @@
        <PackageVersion Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
        <PackageVersion Include="Avalonia.Controls.DataGrid" Version="$(DataGridVersion)"/>
        <PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.1.1"/>
-        <PackageVersion Include="Irihi.Avalonia.Shared" Version="0.4.0-preview1"/>
+        <PackageVersion Include="Irihi.Avalonia.Shared" Version="0.4.0-nightly-20260206184422"/>
    </ItemGroup>
 </Project>
--- a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
+++ b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
-        <Version>12.0.0-preview1</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 12.0.0-preview1</PackageReleaseNotes>
+        <TargetFramework>net8.0</TargetFramework>
+        <Version>11.3.7.2</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 11.3.7.2</PackageReleaseNotes>
        <Title>Semi.Avalonia.ColorPicker</Title>
    </PropertyGroup>

    <ItemGroup>
+        <PackageReference Include="Irihi.Avalonia.Shared" />
        <PackageReference Include="Avalonia.Controls.ColorPicker"/>
-        <PackageReference Include="Irihi.Avalonia.Shared"/>
        <None Include="README.md" Pack="true" PackagePath="\"/>
    </ItemGroup>

--- a/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs
+++ b/src/Semi.Avalonia.ColorPicker/SemiColorDarkPalette.cs
@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Utilities;
-using Irihi.Avalonia.Shared.Helpers;

 namespace Semi.Avalonia.ColorPicker;

@@ -221,8 +220,8 @@ public class SemiColorDarkPalette: IColorPalette
    public Color GetColor(int colorIndex, int shadeIndex)
    {
        return Colors[
-            MathHelpers.SafeClamp(colorIndex, 0, ColorCount - 1),
-            MathHelpers.SafeClamp(shadeIndex, 0, ShadeCount - 1)
+            MathUtilities.Clamp(colorIndex, 0, ColorCount - 1),
+            MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1)
        ];
    }

--- a/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs
+++ b/src/Semi.Avalonia.ColorPicker/SemiColorLightPalette.cs
@@ -1,7 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Media;
 using Avalonia.Utilities;
-using Irihi.Avalonia.Shared.Helpers;

 namespace Semi.Avalonia.ColorPicker;

@@ -221,8 +220,8 @@ public class SemiColorLightPalette: IColorPalette
    public Color GetColor(int colorIndex, int shadeIndex)
    {
        return Colors[
-            MathHelpers.SafeClamp(colorIndex, 0, ColorCount - 1),
-            MathHelpers.SafeClamp(shadeIndex, 0, ShadeCount - 1)
+            MathUtilities.Clamp(colorIndex, 0, ColorCount - 1),
+            MathUtilities.Clamp(shadeIndex, 0, ShadeCount - 1)
        ];
    }

--- a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
+++ b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
@@ -2,8 +2,8 @@

    <PropertyGroup>
        <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
-        <Version>11.3.7.3</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.3.7.3</PackageReleaseNotes>
+        <Version>11.3.7.2</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.3.7.2</PackageReleaseNotes>
        <Title>Semi.Avalonia.DataGrid</Title>
    </PropertyGroup>

--- a/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
+++ b/src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
@@ -1,7 +1,6 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:iri="https://irihi.tech/shared">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <Design.PreviewWith>
        <StackPanel Margin="20" Spacing="20">
            <TextBox Text="Hello" />
@@ -21,7 +20,6 @@
                            Name="PART_TextBox"
                            VerticalAlignment="Stretch"
                            MinHeight="{TemplateBinding MinHeight}"
-                            ClearSelectionOnLostFocus="{TemplateBinding ClearSelectionOnLostFocus}"
                            DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                            Theme="{DynamicResource NonErrorTextBox}"
                            InnerLeftContent="{TemplateBinding InnerLeftContent}"
@@ -58,13 +56,45 @@
        </Setter>

        <Style Selector="^.Bordered">
-            <Style Selector="^ /template/ TextBox#PART_TextBox">
-                <Setter Property="MinHeight" Value="0" />
-                <Setter Property="iri:ClassHelper.Classes" Value="Bordered" />
-            </Style>
-            <Style Selector="^ /template/ ListBox#PART_SelectingItemsControl">
-                <Setter Property="ScrollViewer.IsScrollChainingEnabled" Value="False" />
-            </Style>
+            <Setter Property="Template">
+                <ControlTemplate TargetType="AutoCompleteBox">
+                    <Panel>
+                        <TextBox
+                            Name="PART_TextBox"
+                            VerticalAlignment="Stretch"
+                            MinHeight="0"
+                            Classes="Bordered"
+                            DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
+                            PlaceholderForeground="{TemplateBinding PlaceholderForeground}"
+                            PlaceholderText="{TemplateBinding PlaceholderText}" />
+                        <Popup
+                            Name="PART_Popup"
+                            MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                            InheritsTransform="True"
+                            IsLightDismissEnabled="True"
+                            PlacementTarget="{TemplateBinding}">
+                            <Border
+                                MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
+                                Margin="{DynamicResource AutoCompleteBoxPopupMargin}"
+                                Padding="{DynamicResource AutoCompleteBoxPopupPadding}"
+                                HorizontalAlignment="Stretch"
+                                Background="{DynamicResource AutoCompleteBoxPopupBackground}"
+                                BorderBrush="{DynamicResource AutoCompleteBoxPopupBorderBrush}"
+                                BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
+                                BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
+                                CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
+                                <ListBox
+                                    Name="PART_SelectingItemsControl"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    ItemTemplate="{TemplateBinding ItemTemplate}"
+                                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                    ScrollViewer.VerticalScrollBarVisibility="Auto" 
+                                    ScrollViewer.IsScrollChainingEnabled="False" />
+                            </Border>
+                        </Popup>
+                    </Panel>
+                </ControlTemplate>
+            </Setter>
        </Style>
        <Style Selector="^.Large">
            <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />
--- a/src/Semi.Avalonia/Controls/CaptionButtons.axaml
+++ b/src/Semi.Avalonia/Controls/CaptionButtons.axaml
@@ -0,0 +1,100 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Design.PreviewWith>
+        <CaptionButtons />
+    </Design.PreviewWith>
+
+    <ControlTheme x:Key="CaptionButton" TargetType="Button">
+        <Setter Property="Foreground" Value="{DynamicResource CaptionButtonForeground}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="CornerRadius" Value="{StaticResource CaptionButtonCornerRadius}" />
+        <Setter Property="Padding" Value="{StaticResource CaptionButtonPadding}" />
+        <Setter Property="Width" Value="{StaticResource CaptionButtonWidth}" />
+        <Setter Property="Height" Value="{StaticResource CaptionButtonHeight}" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="Button">
+                <ContentPresenter
+                    Name="PART_ContentPresenter"
+                    Padding="{TemplateBinding Padding}"
+                    Foreground="{TemplateBinding Foreground}"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Content="{TemplateBinding Content}"
+                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                    CornerRadius="{TemplateBinding CornerRadius}" />
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:pointerover">
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonPointeroverBackground}" />
+        </Style>
+
+        <Style Selector="^:pressed">
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonPressedBackground}" />
+        </Style>
+    </ControlTheme>
+
+    <ControlTheme x:Key="{x:Type CaptionButtons}" TargetType="CaptionButtons">
+        <Setter Property="Foreground" Value="{DynamicResource CaptionButtonForeground}" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="CaptionButtons">
+                <StackPanel Orientation="Horizontal">
+                    <Button Name="PART_FullScreenButton" Theme="{StaticResource CaptionButton}">
+                        <PathIcon
+                            Name="PART_FullScreenButtonIcon"
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource WindowExpandGlyph}"
+                            Foreground="{Binding $parent[Button].Foreground}" />
+                    </Button>
+                    <Button Name="PART_MinimizeButton" Theme="{StaticResource CaptionButton}">
+                        <PathIcon
+                            Name="PART_MinimizeButtonIcon"
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource WindowMinimizeGlyph}"
+                            Foreground="{Binding $parent[Button].Foreground}" />
+                    </Button>
+                    <Button Name="PART_RestoreButton" Theme="{StaticResource CaptionButton}">
+                        <PathIcon
+                            Name="PART_RestoreButtonIcon"
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource WindowMaximizeGlyph}"
+                            Foreground="{Binding $parent[Button].Foreground}" />
+                    </Button>
+                    <Button Name="PART_CloseButton" Theme="{StaticResource CaptionButton}">
+                        <PathIcon
+                            Name="PART_CloseButtonIcon"
+                            Theme="{StaticResource InnerPathIcon}"
+                            Data="{StaticResource WindowCloseIconGlyph}"
+                            Foreground="{Binding $parent[Button].Foreground}" />
+                    </Button>
+                </StackPanel>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^ /template/ Button#PART_CloseButton:pointerover">
+            <Setter Property="Foreground" Value="{DynamicResource CaptionButtonCloseForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePointeroverBackground}" />
+        </Style>
+        <Style Selector="^ /template/ Button#PART_CloseButton:pressed">
+            <Setter Property="Foreground" Value="{DynamicResource CaptionButtonCloseForeground}" />
+            <Setter Property="Background" Value="{DynamicResource CaptionButtonClosePressedBackground}" />
+        </Style>
+
+        <Style Selector="^:maximized /template/ PathIcon#PART_RestoreButtonIcon">
+            <Setter Property="Data" Value="{StaticResource WindowRestoreGlyph}" />
+        </Style>
+        <Style Selector="^:fullscreen /template/ PathIcon#PART_FullScreenButtonIcon">
+            <Setter Property="Data" Value="{StaticResource WindowCollapseGlyph}" />
+        </Style>
+        <Style Selector="^:fullscreen /template/ Button#PART_RestoreButton">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+        <Style Selector="^:fullscreen /template/ Button#PART_MinimizeButton">
+            <Setter Property="IsVisible" Value="False" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -2,10 +2,9 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <Design.PreviewWith>
-        <StackPanel Margin="20">
+        <Border Padding="20">
            <DatePickerPresenter />
-            <DatePicker Width="500" />
-        </StackPanel>
+        </Border>
    </Design.PreviewWith>
    <ControlTheme x:Key="{x:Type DatePickerPresenter}" TargetType="DatePickerPresenter">
        <Setter Property="Width" Value="296" />
@@ -142,7 +141,6 @@
        <Setter Property="HorizontalAlignment" Value="Left" />
        <Setter Property="VerticalAlignment" Value="Center" />
        <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
-        <Setter Property="MinWidth" Value="296" />
        <Setter Property="Template">
            <ControlTemplate TargetType="DatePicker">
                <DataValidationErrors>
@@ -154,8 +152,8 @@
                            Name="PART_FlyoutButton"
                            Grid.Column="0"
                            Grid.ColumnSpan="2"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MaxWidth="{TemplateBinding MaxWidth}"
+                            Width="298"
+                            MinWidth="298"
                            MinHeight="{TemplateBinding MinHeight}"
                            HorizontalAlignment="Stretch"
                            VerticalAlignment="Stretch"
--- a/src/Semi.Avalonia/Controls/ScrollViewer.axaml
+++ b/src/Semi.Avalonia/Controls/ScrollViewer.axaml
@@ -53,7 +53,6 @@
                                MinWidth="{StaticResource ScrollBarThickness}"
                                VerticalAlignment="Center"
                                Focusable="False"
-                                AutomationProperties.Name="Column left"
                                Theme="{StaticResource ScrollBarRepeatButton}">
                                <PathIcon
                                    Theme="{StaticResource InnerPathIcon}"
@@ -76,7 +75,6 @@
                                        VerticalAlignment="Stretch"
                                        CornerRadius="0"
                                        Focusable="False"
-                                        AutomationProperties.Name="Page left"
                                        Theme="{StaticResource ScrollBarRepeatButton}" />
                                </Track.DecreaseButton>
                                <Track.IncreaseButton>
@@ -87,10 +85,9 @@
                                        VerticalAlignment="Stretch"
                                        CornerRadius="0"
                                        Focusable="False"
-                                        AutomationProperties.Name="Page right"
                                        Theme="{StaticResource ScrollBarRepeatButton}" />
                                </Track.IncreaseButton>
-                                <Thumb Name="thumb" AutomationProperties.Name="Position" />
+                                <Thumb Name="thumb" />
                            </Track>
                            <RepeatButton
                                Name="PART_LineDownButton"
@@ -99,7 +96,6 @@
                                VerticalAlignment="Center"
                                VerticalContentAlignment="Center"
                                Focusable="False"
-                                AutomationProperties.Name="Column right"
                                Theme="{DynamicResource ScrollBarRepeatButton}">
                                <PathIcon
                                    Theme="{DynamicResource InnerPathIcon}"
@@ -127,7 +123,6 @@
                                HorizontalContentAlignment="Center"
                                VerticalContentAlignment="Center"
                                Focusable="False"
-                                AutomationProperties.Name="Line up"
                                Theme="{StaticResource ScrollBarRepeatButton}">
                                <PathIcon
                                    Theme="{StaticResource InnerPathIcon}"
@@ -151,7 +146,6 @@
                                        VerticalAlignment="Stretch"
                                        CornerRadius="0"
                                        Focusable="False"
-                                        AutomationProperties.Name="Page up"
                                        Theme="{StaticResource ScrollBarRepeatButton}" />
                                </Track.DecreaseButton>
                                <Track.IncreaseButton>
@@ -162,10 +156,9 @@
                                        VerticalAlignment="Stretch"
                                        CornerRadius="0"
                                        Focusable="False"
-                                        AutomationProperties.Name="Page down"
                                        Theme="{StaticResource ScrollBarRepeatButton}" />
                                </Track.IncreaseButton>
-                                <Thumb Name="thumb" AutomationProperties.Name="Position" />
+                                <Thumb Name="thumb" />
                            </Track>
                            <RepeatButton
                                Name="PART_LineDownButton"
@@ -174,7 +167,6 @@
                                HorizontalContentAlignment="Center"
                                VerticalContentAlignment="Center"
                                Focusable="False"
-                                AutomationProperties.Name="Line down"
                                Theme="{StaticResource ScrollBarRepeatButton}">
                                <PathIcon
                                    Theme="{StaticResource InnerPathIcon}"
--- a/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
+++ b/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
@@ -2,10 +2,7 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

-    <MenuFlyout
-        x:Key="SelectableTextBlockContextFlyout"
-        ShowMode="{OnFormFactor Desktop=Standard, Mobile=Transient}"
-        Placement="Bottom">
+    <MenuFlyout x:Key="SelectableTextBlockContextFlyout" Placement="Bottom">
        <MenuItem
            Command="{Binding $parent[SelectableTextBlock].Copy}"
            Header="{DynamicResource STRING_MENU_COPY}"
--- a/src/Semi.Avalonia/Controls/Slider.axaml
+++ b/src/Semi.Avalonia/Controls/Slider.axaml
@@ -92,12 +92,11 @@
                                VerticalAlignment="Bottom"
                                Fill="{DynamicResource SliderTickForeground}"
                                IsVisible="False"
-                                Maximum="{TemplateBinding Maximum}"
-                                Minimum="{TemplateBinding Minimum}"
-                                Orientation="{TemplateBinding Orientation}"
+                                Maximum="{TemplateBinding Slider.Maximum}"
+                                Minimum="{TemplateBinding Slider.Minimum}"
+                                Orientation="{TemplateBinding Slider.Orientation}"
                                Placement="Top"
-                                IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                                TickFrequency="{TemplateBinding TickFrequency}"
+                                TickFrequency="{TemplateBinding Slider.TickFrequency}"
                                Ticks="{TemplateBinding Ticks}" />
                            <TickBar
                                Name="BottomTickBar"
@@ -107,12 +106,11 @@
                                VerticalAlignment="Top"
                                Fill="{DynamicResource SliderTickForeground}"
                                IsVisible="False"
-                                Maximum="{TemplateBinding Maximum}"
-                                Minimum="{TemplateBinding Minimum}"
-                                Orientation="{TemplateBinding Orientation}"
+                                Maximum="{TemplateBinding Slider.Maximum}"
+                                Minimum="{TemplateBinding Slider.Minimum}"
+                                Orientation="{TemplateBinding Slider.Orientation}"
                                Placement="Bottom"
-                                IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                                TickFrequency="{TemplateBinding TickFrequency}"
+                                TickFrequency="{TemplateBinding Slider.TickFrequency}"
                                Ticks="{TemplateBinding Ticks}" />
                            <Track
                                Name="PART_Track"
@@ -171,12 +169,11 @@
                                HorizontalAlignment="Right"
                                Fill="{DynamicResource SliderTickForeground}"
                                IsVisible="False"
-                                Maximum="{TemplateBinding Maximum}"
-                                Minimum="{TemplateBinding Minimum}"
-                                Orientation="{TemplateBinding Orientation}"
+                                Maximum="{TemplateBinding Slider.Maximum}"
+                                Minimum="{TemplateBinding Slider.Minimum}"
+                                Orientation="{TemplateBinding Slider.Orientation}"
                                Placement="Left"
-                                IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                                TickFrequency="{TemplateBinding TickFrequency}"
+                                TickFrequency="{TemplateBinding Slider.TickFrequency}"
                                Ticks="{TemplateBinding Ticks}" />
                            <TickBar
                                Name="RightTickBar"
@@ -186,12 +183,11 @@
                                HorizontalAlignment="Left"
                                Fill="{DynamicResource SliderTickForeground}"
                                IsVisible="False"
-                                Maximum="{TemplateBinding Maximum}"
-                                Minimum="{TemplateBinding Minimum}"
-                                Orientation="{TemplateBinding Orientation}"
+                                Maximum="{TemplateBinding Slider.Maximum}"
+                                Minimum="{TemplateBinding Slider.Minimum}"
+                                Orientation="{TemplateBinding Slider.Orientation}"
                                Placement="Right"
-                                IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
-                                TickFrequency="{TemplateBinding TickFrequency}"
+                                TickFrequency="{TemplateBinding Slider.TickFrequency}"
                                Ticks="{TemplateBinding Ticks}" />
                            <Track
                                Name="PART_Track"
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -1,10 +1,7 @@
 <ResourceDictionary
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <MenuFlyout
-        x:Key="DefaultTextBoxContextFlyout"
-        ShowMode="{OnFormFactor Desktop=Standard, Mobile=Transient}"
-        Placement="Bottom">
+    <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
        <MenuItem
            Command="{Binding $parent[TextBox].Cut}"
            Header="{DynamicResource STRING_MENU_CUT}"
--- a/src/Semi.Avalonia/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -2,10 +2,9 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <Design.PreviewWith>
-        <StackPanel Margin="20">
+        <Border Padding="20">
            <TimePickerPresenter />
-            <TimePicker UseSeconds="True" Width="500" />
-        </StackPanel>
+        </Border>
    </Design.PreviewWith>
    <ControlTheme x:Key="{x:Type TimePickerPresenter}" TargetType="TimePickerPresenter">
        <Setter Property="Width" Value="242" />
@@ -164,7 +163,6 @@
        <Setter Property="HorizontalAlignment" Value="Left" />
        <Setter Property="VerticalAlignment" Value="Center" />
        <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
-        <Setter Property="MinWidth" Value="242" />
        <Setter Property="Template">
            <ControlTemplate>
                <DataValidationErrors>
@@ -176,8 +174,8 @@
                            Name="PART_FlyoutButton"
                            Grid.Column="0"
                            Grid.ColumnSpan="2"
-                            MinWidth="{TemplateBinding MinWidth}"
-                            MaxWidth="{TemplateBinding MaxWidth}"
+                            Width="242"
+                            MinWidth="242"
                            MinHeight="{TemplateBinding MinHeight}"
                            HorizontalAlignment="Stretch"
                            VerticalAlignment="Stretch"
--- a/src/Semi.Avalonia/Controls/TitleBar.axaml
+++ b/src/Semi.Avalonia/Controls/TitleBar.axaml
@@ -0,0 +1,51 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type TitleBar}" TargetType="TitleBar">
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Panel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="Stretch">
+                    <Panel
+                        Name="PART_MouseTracker"
+                        Height="1"
+                        VerticalAlignment="Top" />
+                    <Panel Name="PART_Container">
+                        <Border
+                            Name="PART_Background"
+                            Background="{TemplateBinding Background}"
+                            IsHitTestVisible="False" />
+                        <CaptionButtons
+                            Name="PART_CaptionButtons"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            Foreground="{TemplateBinding Foreground}" />
+                    </Panel>
+                </Panel>
+            </ControlTemplate>
+        </Setter>
+
+        <Style Selector="^:fullscreen /template/ Border#PART_Background">
+            <Setter Property="IsHitTestVisible" Value="True" />
+        </Style>
+
+        <Style Selector="^:fullscreen /template/ Panel#PART_MouseTracker">
+            <Setter Property="Background" Value="Transparent" />
+        </Style>
+
+        <Style Selector="^:fullscreen /template/ Panel#PART_Container">
+            <Setter Property="RenderTransform" Value="translateY(-50px)" />
+            <Setter Property="Transitions">
+                <Transitions>
+                    <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.1" />
+                </Transitions>
+            </Setter>
+        </Style>
+
+        <Style Selector="^:fullscreen:pointerover /template/ Panel#PART_Container">
+            <Setter Property="RenderTransform" Value="none" />
+        </Style>
+    </ControlTheme>
+</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/Window.axaml
+++ b/src/Semi.Avalonia/Controls/Window.axaml
@@ -15,6 +15,9 @@
                    <Border Background="{TemplateBinding Background}" IsHitTestVisible="False" />
                    <Panel Margin="{TemplateBinding WindowDecorationMargin}" Background="Transparent" />
                    <VisualLayerManager>
+                        <VisualLayerManager.ChromeOverlayLayer>
+                            <TitleBar />
+                        </VisualLayerManager.ChromeOverlayLayer>
                        <ContentPresenter
                            Name="PART_ContentPresenter"
                            Margin="{TemplateBinding Padding}"
--- a/src/Semi.Avalonia/Controls/WindowDrawnDecorations.axaml
+++ b/src/Semi.Avalonia/Controls/WindowDrawnDecorations.axaml
@@ -1,218 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <ControlTheme x:Key="CaptionButton" TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource CaptionButtonForeground}" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="CornerRadius" Value="{StaticResource CaptionButtonCornerRadius}" />
-        <Setter Property="Padding" Value="{StaticResource CaptionButtonPadding}" />
-        <Setter Property="Width" Value="{StaticResource CaptionButtonWidth}" />
-        <Setter Property="Height" Value="{StaticResource CaptionButtonHeight}" />
-        <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="WindowDecorationProperties.ElementRole" Value="DecorationsElement" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="Button">
-                <ContentPresenter
-                    Name="PART_ContentPresenter"
-                    Padding="{TemplateBinding Padding}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Content="{TemplateBinding Content}"
-                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                    CornerRadius="{TemplateBinding CornerRadius}" />
-            </ControlTemplate>
-        </Setter>
-
-        <Style Selector="^:pointerover">
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonPointeroverBackground}" />
-        </Style>
-
-        <Style Selector="^:pressed">
-            <Setter Property="Background" Value="{DynamicResource CaptionButtonPressedBackground}" />
-        </Style>
-    </ControlTheme>
-
-    <ControlTheme x:Key="{x:Type WindowDrawnDecorations}" TargetType="WindowDrawnDecorations">
-        <Setter Property="DefaultTitleBarHeight" Value="32" />
-        <Setter Property="DefaultFrameThickness" Value="1" />
-        <Setter Property="DefaultShadowThickness" Value="8" />
-        <Setter Property="Template">
-            <WindowDrawnDecorationsTemplate>
-                <WindowDrawnDecorationsContent>
-
-                    <WindowDrawnDecorationsContent.Underlay>
-                        <Panel Name="PART_UnderlayWrapper">
-                            <Border Name="PART_WindowBorder"
-                                    Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
-                                    BorderThickness="{TemplateBinding FrameThickness}"
-                                    BorderBrush="{DynamicResource SystemControlForegroundBaseMediumBrush}"
-                                    IsHitTestVisible="False" />
-                            <!-- Titlebar: background, title text, and drag area live in underlay -->
-                            <Panel Name="PART_TitleBar" VerticalAlignment="Top"
-                                   Height="{TemplateBinding TitleBarHeight}"
-                                   Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
-                                   IsVisible="{TemplateBinding HasTitleBar}"
-                                   WindowDecorationProperties.ElementRole="TitleBar" />
-
-                        </Panel>
-                    </WindowDrawnDecorationsContent.Underlay>
-
-                    <WindowDrawnDecorationsContent.Overlay>
-                        <!-- Overlay: only interactive caption buttons -->
-                        <Panel Name="PART_OverlayWrapper">
-                            <!-- Title text lives in overlay so it renders above client content -->
-                            <Panel Name="PART_TitleTextPanel" VerticalAlignment="Top"
-                                   Height="{TemplateBinding TitleBarHeight}"
-                                   IsHitTestVisible="False"
-                                   IsVisible="{TemplateBinding HasTitleBar}">
-                                <TextBlock Text="{TemplateBinding Title}"
-                                           VerticalAlignment="Center"
-                                           Margin="12,0,0,0"
-                                           FontSize="12" />
-                            </Panel>
-                            <StackPanel Name="PART_OverlayPanel"
-                                        VerticalAlignment="Top"
-                                        HorizontalAlignment="Right"
-                                        Height="{TemplateBinding TitleBarHeight}"
-                                        IsVisible="{TemplateBinding HasTitleBar}"
-                                        Orientation="Horizontal"
-                                        Spacing="2"
-                                        TextElement.FontSize="10">
-                                <Button
-                                    Name="PART_FullScreenButton"
-                                    Theme="{StaticResource CaptionButton}"
-                                    WindowDecorationProperties.ElementRole="FullScreenButton">
-                                    <PathIcon
-                                        Name="PART_FullScreenButtonIcon"
-                                        Theme="{StaticResource InnerPathIcon}"
-                                        Data="{StaticResource WindowExpandGlyph}"
-                                        Foreground="{Binding $parent[Button].Foreground}" />
-                                </Button>
-                                <Button
-                                    Name="PART_MinimizeButton"
-                                    Theme="{StaticResource CaptionButton}"
-                                    WindowDecorationProperties.ElementRole="MinimizeButton">
-                                    <PathIcon
-                                        Name="PART_MinimizeButtonIcon"
-                                        Theme="{StaticResource InnerPathIcon}"
-                                        Data="{StaticResource WindowMinimizeGlyph}"
-                                        Foreground="{Binding $parent[Button].Foreground}" />
-                                </Button>
-                                <Button
-                                    Name="PART_MaximizeButton"
-                                    Theme="{StaticResource CaptionButton}"
-                                    WindowDecorationProperties.ElementRole="MaximizeButton">
-                                    <PathIcon
-                                        Name="PART_MaximizeButtonIcon"
-                                        Theme="{StaticResource InnerPathIcon}"
-                                        Data="{StaticResource WindowMaximizeGlyph}"
-                                        Foreground="{Binding $parent[Button].Foreground}" />
-                                </Button>
-                                <Button
-                                    Name="PART_CloseButton"
-                                    Theme="{StaticResource CaptionButton}"
-                                    WindowDecorationProperties.ElementRole="CloseButton">
-                                    <PathIcon
-                                        Name="PART_CloseButtonIcon"
-                                        Theme="{StaticResource InnerPathIcon}"
-                                        Data="{StaticResource WindowCloseIconGlyph}"
-                                        Foreground="{Binding $parent[Button].Foreground}" />
-                                </Button>
-                            </StackPanel>
-                        </Panel>
-                    </WindowDrawnDecorationsContent.Overlay>
-
-                    <WindowDrawnDecorationsContent.FullscreenPopover>
-                        <Panel Height="{TemplateBinding DefaultTitleBarHeight}"
-                               VerticalAlignment="Top"
-                               Background="{DynamicResource SystemControlBackgroundChromeMediumLowBrush}"
-                               WindowDecorationProperties.ElementRole="TitleBar">
-                            <TextBlock Text="{TemplateBinding Title}"
-                                       VerticalAlignment="Center"
-                                       Margin="12,0,0,0"
-                                       FontSize="12" />
-                            <StackPanel HorizontalAlignment="Right"
-                                        Orientation="Horizontal"
-                                        Spacing="2"
-                                        TextElement.FontSize="10">
-                                <Button Name="PART_PopoverFullScreenButton"
-                                        Theme="{StaticResource CaptionButton}"
-                                        WindowDecorationProperties.ElementRole="FullScreenButton">
-                                    <PathIcon
-                                        Name="PART_PopoverFullScreenButtonIcon"
-                                        Theme="{StaticResource InnerPathIcon}"
-                                        Data="{StaticResource WindowCollapseGlyph}"
-                                        Foreground="{Binding $parent[Button].Foreground}" />
-                                </Button>
-                                <Button Name="PART_PopoverCloseButton"
-                                        Theme="{StaticResource CaptionButton}"
-                                        WindowDecorationProperties.ElementRole="CloseButton">
-                                    <PathIcon
-                                        Name="PART_PopoverCloseButtonIcon"
-                                        Theme="{StaticResource InnerPathIcon}"
-                                        Data="{StaticResource WindowCloseIconGlyph}"
-                                        Foreground="{Binding $parent[Button].Foreground}" />
-                                </Button>
-                            </StackPanel>
-                        </Panel>
-                    </WindowDrawnDecorationsContent.FullscreenPopover>
-
-                </WindowDrawnDecorationsContent>
-            </WindowDrawnDecorationsTemplate>
-        </Setter>
-
-        <!-- Shadow: inset border and add drop shadow -->
-        <Style Selector="^:has-shadow">
-            <Style Selector="^ /template/ Panel#PART_UnderlayWrapper">
-                <Setter Property="Margin" Value="{TemplateBinding ShadowThickness}" />
-            </Style>
-            <Style Selector="^ /template/ Border#PART_WindowBorder">
-                <Setter Property="BoxShadow" Value="{DynamicResource WindowBorderShadow}" />
-            </Style>
-            <Style Selector="^ /template/ Panel#PART_OverlayWrapper">
-                <Setter Property="Margin" Value="{TemplateBinding ShadowThickness}" />
-            </Style>
-        </Style>
-
-        <!-- Border: inset titlebar and buttons inside frame -->
-        <Style Selector="^:has-border">
-            <Style Selector="^ /template/ Panel#PART_TitleTextPanel">
-                <Setter Property="Margin" Value="1,1,1,0" />
-            </Style>
-            <Style Selector="^ /template/ Panel#PART_TitleBar">
-                <Setter Property="Margin" Value="1,1,1,0" />
-            </Style>
-            <Style Selector="^ /template/ StackPanel#PART_OverlayPanel">
-                <Setter Property="Margin" Value="0,1,1,0" />
-            </Style>
-        </Style>
-
-        <!-- Fullscreen: hide overlay and titlebar (popover takes over) -->
-        <Style Selector="^:fullscreen">
-            <Style Selector="^ /template/ Panel#PART_TitleTextPanel">
-                <Setter Property="IsVisible" Value="False" />
-            </Style>
-            <Style Selector="^ /template/ StackPanel#PART_OverlayPanel">
-                <Setter Property="IsVisible" Value="False" />
-            </Style>
-            <Style Selector="^ /template/ Panel#PART_TitleBar">
-                <Setter Property="IsVisible" Value="False" />
-            </Style>
-            <Style Selector="^ /template/ PathIcon#PART_FullScreenButtonIcon">
-                <Setter Property="Data" Value="{StaticResource WindowCollapseGlyph}" />
-            </Style>
-        </Style>
-
-        <Style Selector="^:maximized /template/ PathIcon#PART_MaximizeButtonIcon">
-            <Setter Property="Data" Value="{StaticResource WindowRestoreGlyph}" />
-        </Style>
-
-        <Style Selector="^ /template/ Button:disabled">
-            <Setter Property="Opacity" Value="0.2" />
-        </Style>
-
-    </ControlTheme>
-</ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/_index.axaml
+++ b/src/Semi.Avalonia/Controls/_index.axaml
@@ -9,6 +9,7 @@
        <ResourceInclude Source="ButtonSpinner.axaml" />
        <ResourceInclude Source="Calendar.axaml" />
        <ResourceInclude Source="CalendarDatePicker.axaml" />
+        <ResourceInclude Source="CaptionButtons.axaml" />
        <ResourceInclude Source="Carousel.axaml" />
        <ResourceInclude Source="CheckBox.axaml" />
        <ResourceInclude Source="ComboBox.axaml" />
@@ -50,13 +51,13 @@
        <ResourceInclude Source="TextBox.axaml" />
        <ResourceInclude Source="ThemeVariantScope.axaml" />
        <ResourceInclude Source="TimePicker.axaml" />
+        <ResourceInclude Source="TitleBar.axaml" />
        <ResourceInclude Source="ToggleButton.axaml" />
        <ResourceInclude Source="ToggleSwitch.axaml" />
        <ResourceInclude Source="Tooltip.axaml" />
        <ResourceInclude Source="TransitioningContentControl.axaml" />
        <ResourceInclude Source="TreeView.axaml" />
        <ResourceInclude Source="Window.axaml" />
-        <ResourceInclude Source="WindowDrawnDecorations.axaml" />
        <ResourceInclude Source="WindowNotificationManager.axaml" />
    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Semi.Avalonia.csproj
+++ b/src/Semi.Avalonia/Semi.Avalonia.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
-        <Version>12.0.0-preview1</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia 12.0.0-preview1</PackageReleaseNotes>
+        <TargetFramework>net8.0</TargetFramework>
+        <Version>11.3.7.2</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia 11.3.7.2</PackageReleaseNotes>
        <Title>Semi.Avalonia</Title>
    </PropertyGroup>

--- a/src/Semi.Avalonia/Themes/Dark/WindowDrawnDecorations.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/WindowDrawnDecorations.axaml
@@ -1,6 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="WindowBorderShadow" ResourceKey="SemiShadowElevated"/>
-
    <StaticResource x:Key="CaptionButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
    <StaticResource x:Key="CaptionButtonPressedBackground" ResourceKey="SemiColorFill2" />
    <StaticResource x:Key="CaptionButtonCloseForeground" ResourceKey="SemiColorWhite" />
--- a/src/Semi.Avalonia/Themes/Dark/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/_index.axaml
@@ -7,6 +7,7 @@
        <ResourceInclude Source="ButtonSpinner.axaml" />
        <ResourceInclude Source="Calendar.axaml" />
        <ResourceInclude Source="CalendarDatePicker.axaml" />
+        <ResourceInclude Source="CaptionButtons.axaml" />
        <ResourceInclude Source="Carousel.axaml" />
        <ResourceInclude Source="CheckBox.axaml" />
        <ResourceInclude Source="ComboBox.axaml" />
@@ -42,6 +43,5 @@
        <ResourceInclude Source="Tooltip.axaml" />
        <ResourceInclude Source="TreeView.axaml" />
        <ResourceInclude Source="Window.axaml" />
-        <ResourceInclude Source="WindowDrawnDecorations.axaml" />
    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/HighContrast/WindowDrawnDecorations.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/WindowDrawnDecorations.axaml
--- a/src/Semi.Avalonia/Themes/HighContrast/_index.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/_index.axaml
@@ -7,6 +7,7 @@
        <ResourceInclude Source="ButtonSpinner.axaml" />
        <ResourceInclude Source="Calendar.axaml" />
        <ResourceInclude Source="CalendarDatePicker.axaml" />
+        <ResourceInclude Source="CaptionButtons.axaml" />
        <ResourceInclude Source="Carousel.axaml" />
        <ResourceInclude Source="CheckBox.axaml" />
        <ResourceInclude Source="ComboBox.axaml" />
@@ -42,6 +43,5 @@
        <ResourceInclude Source="Tooltip.axaml" />
        <ResourceInclude Source="TreeView.axaml" />
        <ResourceInclude Source="Window.axaml" />
-        <ResourceInclude Source="WindowDrawnDecorations.axaml" />
    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Light/WindowDrawnDecorations.axaml
+++ b/src/Semi.Avalonia/Themes/Light/WindowDrawnDecorations.axaml
@@ -1,6 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StaticResource x:Key="WindowBorderShadow" ResourceKey="SemiShadowElevated"/>
-
    <StaticResource x:Key="CaptionButtonPointeroverBackground" ResourceKey="SemiColorFill1" />
    <StaticResource x:Key="CaptionButtonPressedBackground" ResourceKey="SemiColorFill2" />
    <StaticResource x:Key="CaptionButtonCloseForeground" ResourceKey="SemiColorWhite" />
--- a/src/Semi.Avalonia/Themes/Light/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Light/_index.axaml
@@ -7,6 +7,7 @@
        <ResourceInclude Source="ButtonSpinner.axaml" />
        <ResourceInclude Source="Calendar.axaml" />
        <ResourceInclude Source="CalendarDatePicker.axaml" />
+        <ResourceInclude Source="CaptionButtons.axaml" />
        <ResourceInclude Source="Carousel.axaml" />
        <ResourceInclude Source="CheckBox.axaml" />
        <ResourceInclude Source="ComboBox.axaml" />
@@ -42,6 +43,5 @@
        <ResourceInclude Source="Tooltip.axaml" />
        <ResourceInclude Source="TreeView.axaml" />
        <ResourceInclude Source="Window.axaml" />
-        <ResourceInclude Source="WindowDrawnDecorations.axaml" />
    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Themes/Shared/WindowDrawnDecorations.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/WindowDrawnDecorations.axaml
--- a/src/Semi.Avalonia/Themes/Shared/TextBox.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TextBox.axaml
@@ -3,9 +3,9 @@
    <StaticResource x:Key="TextBoxSmallHeight" ResourceKey="SemiHeightControlSmall" />
    <StaticResource x:Key="TextBoxLargeHeight" ResourceKey="SemiHeightControlLarge" />
    <StaticResource x:Key="TextBoxDefaultCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
-    <Thickness x:Key="TextBoxInnerLeftContentPadding">0 0 12 0</Thickness>
-    <Thickness x:Key="TextBoxInnerRightContentPadding">12 0 0 0</Thickness>
-    <Thickness x:Key="TextBoxContentPadding">12 0</Thickness>
+    <Thickness x:Key="TextBoxInnerLeftContentPadding">0 0 8 0</Thickness>
+    <Thickness x:Key="TextBoxInnerRightContentPadding">8 0 0 0</Thickness>
+    <Thickness x:Key="TextBoxContentPadding">8 0</Thickness>
    <StaticResource x:Key="TextBoxBorderThickness" ResourceKey="SemiBorderThicknessControl" />
    <Thickness x:Key="TextBoxTextAreaContentPadding">12 5</Thickness>
    <x:Double x:Key="TextBoxTextAreaHeight">90</x:Double>
--- a/src/Semi.Avalonia/Themes/Shared/_index.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/_index.axaml
@@ -7,6 +7,7 @@
        <ResourceInclude Source="ButtonSpinner.axaml" />
        <ResourceInclude Source="Calendar.axaml" />
        <ResourceInclude Source="CalendarDatePicker.axaml" />
+        <ResourceInclude Source="CaptionButtons.axaml" />
        <ResourceInclude Source="Carousel.axaml" />
        <ResourceInclude Source="CheckBox.axaml" />
        <ResourceInclude Source="ComboBox.axaml" />
@@ -42,6 +43,5 @@
        <ResourceInclude Source="Tooltip.axaml" />
        <ResourceInclude Source="TreeView.axaml" />
        <ResourceInclude Source="Window.axaml" />
-        <ResourceInclude Source="WindowDrawnDecorations.axaml" />
    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Tokens/Variables.axaml
+++ b/src/Semi.Avalonia/Tokens/Variables.axaml
@@ -67,7 +67,7 @@
    <FontWeight x:Key="SemiFontWeightRegular">400</FontWeight> <!-- 字重 - 常规 -->
    <FontWeight x:Key="SemiFontWeightBold">600</FontWeight> <!-- 字重 - 粗 -->
    <FontFamily x:Key="SemiFontFamilyRegular">
-        fonts:Inter#Inter, Inter, -apple-system, BlinkMacSystemFont, PingFang SC,
+        Inter, -apple-system, BlinkMacSystemFont, PingFang SC,
        Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,
        Helvetica, Arial, sans-serif
    </FontFamily>
Author	SHA1	Message	Date
Dong Bin	f3f59bd5b2	Implement PlaceholderText (#727 ) * feat: replace Watermark with PlaceholderText in AutoCompleteBox and related controls * fix: remove duplicate PlaceholderForeground setter.	2026-02-09 15:00:07 +08:00
Zhang Dian	0f63bc68bc	adjust CornerRadius & MinWidth for SplitButton (#725 ) * feat: support CornerRadius for SplitButton. * Update src/Semi.Avalonia/Controls/SplitButton.axaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * feat: refactor SplitButton layout to use Grid for better structure. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-02-07 16:51:27 +08:00
Zhang Dian	f46bd16904	misc: update XML namespace references and converters in XAML files. (#726 )	2026-02-06 23:09:13 +08:00
Zhang Dian	ddad2a80d5	chore: fix conflict typos.	2026-02-06 21:50:08 +08:00
Zhang Dian	e10e83d282	misc: add SemiBorderRadiusSpacingExtraSmall for tokens.	2026-02-06 21:40:49 +08:00
Zhang Dian	9de52992b4	misc: remove useless theme.	2026-02-06 21:39:29 +08:00
Zhang Dian	61fef49023	misc: using AvaloniaUseCompiledBindingsByDefault.	2026-02-06 21:38:48 +08:00
Zhang Dian	05385a733c	feat: colorpicker reference Shared package.	2026-02-06 21:35:03 +08:00
Zhang Dian	646c9c0dbb	feat: add GroupBox.	2026-02-06 21:24:43 +08:00
Zhang Dian	925c368c53	chore: ready for 12.0.x.	2026-02-06 20:24:35 +08:00