feat: enable vulkan in android demo.

2026-03-03 00:00:55 +08:00 · 2024-08-23 11:05:08 +08:00
17 changed files with 156 additions and 296 deletions
--- a/demo/Semi.Avalonia.Demo.Android/MainActivity.cs
+++ b/demo/Semi.Avalonia.Demo.Android/MainActivity.cs
@@ -1,5 +1,6 @@
 using Android.App;
 using Android.Content.PM;
+using Avalonia;
 using Avalonia.Android;

 namespace Semi.Avalonia.Demo.Android;
@@ -13,4 +14,12 @@ namespace Semi.Avalonia.Demo.Android;
    ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
 public class MainActivity : AvaloniaMainActivity<App>
 {
+    protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
+    {
+        return base.CustomizeAppBuilder(builder)
+            .With(new AndroidPlatformOptions()
+            {
+                RenderingMode = [AndroidRenderingMode.Vulkan, AndroidRenderingMode.Egl, AndroidRenderingMode.Software]
+            });
+    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml
@@ -13,8 +13,8 @@
                <Setter Property="HorizontalAlignment" Value="Stretch" />
            </Style>
        </StackPanel.Styles>
-        <Button Name="OpenFileButton" Content="Open File" />
-        <Button Name="SelectFolderButton" Content="Select Folder" />
-        <Button Name="SaveFileButton" Content="Save File" />
+        <Button Name="openFileDialog">Open File</Button>
+        <Button Name="selectFolderDialog">Select Folder</Button>
+        <Button Name="saveFileDialog">Save File</Button>
    </StackPanel>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml.cs
@@ -1,6 +1,10 @@
+using System;
 using System.Collections.Generic;
+using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Dialogs;
 using Avalonia.Interactivity;
+using Avalonia.Markup.Xaml;
 using Avalonia.Platform.Storage;

 namespace Semi.Avalonia.Demo.Pages;
@@ -10,14 +14,14 @@ public partial class ManagedFileChooserDemo : UserControl
    public ManagedFileChooserDemo()
    {
        InitializeComponent();
-        OpenFileButton.Click += OpenFileDialog;
-        SelectFolderButton.Click += SelectFolderDialog;
-        SaveFileButton.Click += SaveFileDialog;
+        openFileDialog.Click += OpenFileDialog;
+        selectFolderDialog.Click += SelectFolderDialog;
+        saveFileDialog.Click += SaveFileDialog;
    }

-    private async void OpenFileDialog(object? sender, RoutedEventArgs args)
+    private async void OpenFileDialog(object sender, RoutedEventArgs args)
    {
-        var sp = GetStorageProvider();
+        IStorageProvider? sp = GetStorageProvider();
        if (sp is null) return;
        var result = await sp.OpenFilePickerAsync(new FilePickerOpenOptions()
        {
@@ -26,10 +30,9 @@ public partial class ManagedFileChooserDemo : UserControl
            AllowMultiple = true,
        });
    }
-
-    private async void SelectFolderDialog(object? sender, RoutedEventArgs args)
+    private async void SelectFolderDialog(object sender, RoutedEventArgs args)
    {
-        var sp = GetStorageProvider();
+        IStorageProvider? sp = GetStorageProvider();
        if (sp is null) return;
        var result = await sp.OpenFolderPickerAsync(new FolderPickerOpenOptions()
        {
@@ -37,17 +40,16 @@ public partial class ManagedFileChooserDemo : UserControl
            AllowMultiple = true,
        });
    }
-
-    private async void SaveFileDialog(object? sender, RoutedEventArgs args)
+    private async void SaveFileDialog(object sender, RoutedEventArgs args)
    {
-        var sp = GetStorageProvider();
+        IStorageProvider? sp = GetStorageProvider();
        if (sp is null) return;
        var result = await sp.SaveFilePickerAsync(new FilePickerSaveOptions()
        {
-            Title = "Save File",
+            Title = "Open File",
        });
    }
-
+    
    private IStorageProvider? GetStorageProvider()
    {
        var topLevel = TopLevel.GetTopLevel(this);
@@ -56,10 +58,10 @@ public partial class ManagedFileChooserDemo : UserControl

    List<FilePickerFileType>? GetFileTypes()
    {
-        return
-        [
+        return new List<FilePickerFileType>
+        {
            FilePickerFileTypes.All,
            FilePickerFileTypes.TextPlain
-        ];
+        };
    }
 }
--- 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.3</Version>
+        <Version>11.1.0.2</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.3</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1.0.2</PackageReleaseNotes>
    </PropertyGroup>

    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
--- 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.3</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1.0.2</PackageReleaseNotes>
    </PropertyGroup>

    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
--- a/src/Semi.Avalonia/Controls/ContextMenu.axaml
+++ b/src/Semi.Avalonia/Controls/ContextMenu.axaml
@@ -26,7 +26,7 @@
                    BorderThickness="{TemplateBinding BorderThickness}"
                    BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <ScrollViewer Theme="{DynamicResource MenuScrollViewer}" CornerRadius="{TemplateBinding CornerRadius}">
+                    <ScrollViewer Theme="{DynamicResource MenuScrollViewer}">
                        <ItemsPresenter
                            Name="PART_ItemsPresenter"
                            Grid.IsSharedSizeScope="True"
--- a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
@@ -4,7 +4,6 @@
    xmlns:converters="using:Semi.Avalonia.Converters"
    xmlns:dialogs="clr-namespace:Avalonia.Dialogs;assembly=Avalonia.Dialogs"
    xmlns:internal="clr-namespace:Avalonia.Dialogs.Internal;assembly=Avalonia.Dialogs"
-    xmlns:cvt="using:Avalonia.Controls.Converters"
    x:CompileBindings="True">
    <!--  Add Resources Here  -->
    <Design.PreviewWith>
@@ -195,46 +194,4 @@
            </ControlTemplate>
        </Setter>
    </ControlTheme>
-
-    <ControlTheme x:Key="{x:Type dialogs:ManagedFileChooserOverwritePrompt}"
-                  TargetType="dialogs:ManagedFileChooserOverwritePrompt">
-        <Setter Property="MaxWidth" Value="400" />
-        <Setter Property="Padding" Value="10"/>
-        <Setter Property="Template">
-            <ControlTemplate>
-                <Border Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        Padding="{TemplateBinding Padding}">
-                    <StackPanel Spacing="10">
-                        <TextBlock TextWrapping="Wrap">
-                            <TextBlock.Text>
-                                <MultiBinding>
-                                    <MultiBinding.Converter>
-                                        <cvt:StringFormatConverter />
-                                    </MultiBinding.Converter>
-                                    <DynamicResource ResourceKey="STRING_CHOOSER_PROMPT_FILE_ALREADY_EXISTS" />
-                                    <TemplateBinding Property="FileName" />
-                                </MultiBinding>
-                            </TextBlock.Text>
-                        </TextBlock>
-                        <StackPanel HorizontalAlignment="Right"
-                                    Spacing="10"
-                                    Orientation="Horizontal">
-                            <Button Theme="{StaticResource SolidButton}"
-                                    Content="{DynamicResource STRING_CHOOSER_DIALOG_OK}"
-                                    HorizontalContentAlignment="Center"
-                                    IsDefault="True"
-                                    Command="{Binding Confirm, RelativeSource={RelativeSource TemplatedParent}}" />
-                            <Button Content="{DynamicResource STRING_CHOOSER_DIALOG_CANCEL}"
-                                    IsCancel="True"
-                                    HorizontalContentAlignment="Center"
-                                    Command="{Binding Cancel, RelativeSource={RelativeSource TemplatedParent}}" />
-                        </StackPanel>
-                    </StackPanel>
-                </Border>
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Controls/Menu.axaml
+++ b/src/Semi.Avalonia/Controls/Menu.axaml
@@ -10,83 +10,73 @@
        <Setter Property="Background" Value="Transparent" />
        <Setter Property="Template">
            <ControlTemplate TargetType="ScrollViewer">
-                <Border 
-                    ClipToBounds="True"
-                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <DockPanel>
-                        <DockPanel.Styles>
-                            <Style Selector="RepeatButton:pressed">
-                                <Setter Property="RenderTransform" Value="{x:Null}" />
-                            </Style>
-                        </DockPanel.Styles>
-                        <RepeatButton
-                            HorizontalAlignment="Stretch"
-                            HorizontalContentAlignment="Center"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}"
-                            CornerRadius="0"
-                            DockPanel.Dock="Top"
-                            RenderTransform="{x:Null}">
-                            <RepeatButton.IsVisible>
-                                <MultiBinding
-                                    Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
-                                    ConverterParameter="0">
-                                    <Binding Path="VerticalScrollBarVisibility"
-                                             RelativeSource="{RelativeSource TemplatedParent}" />
-                                    <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
-                                    <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
-                                    <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
-                                </MultiBinding>
-                            </RepeatButton.IsVisible>
-                            <PathIcon
-                                Width="8"
-                                Height="8"
-                                Data="{DynamicResource MenuScrollViewerUpButtonGlyph}"
-                                Foreground="{DynamicResource MenuFlyoutScrollViewerIconForeground}" />
-                        </RepeatButton>
-                        <RepeatButton
-                            HorizontalAlignment="Stretch"
-                            HorizontalContentAlignment="Center"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}"
-                            CornerRadius="0"
-                            DockPanel.Dock="Bottom"
-                            RenderTransform="{x:Null}">
-                            <RepeatButton.IsVisible>
-                                <MultiBinding
-                                    Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}"
-                                    ConverterParameter="100">
-                                    <Binding Path="VerticalScrollBarVisibility"
-                                             RelativeSource="{RelativeSource TemplatedParent}" />
-                                    <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
-                                    <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
-                                    <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
-                                </MultiBinding>
-                            </RepeatButton.IsVisible>
-                            <PathIcon
-                                Width="8"
-                                Height="8"
-                                Data="{DynamicResource MenuScrollViewerDownButtonGlyph}"
-                                Foreground="{DynamicResource MenuFlyoutScrollViewerIconForeground}" />
-                        </RepeatButton>
-                        <ScrollContentPresenter
-                            Name="PART_ContentPresenter"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalSnapPointsAlignment="{TemplateBinding HorizontalSnapPointsAlignment}"
-                            HorizontalSnapPointsType="{TemplateBinding HorizontalSnapPointsType}"
-                            VerticalSnapPointsAlignment="{TemplateBinding VerticalSnapPointsAlignment}"
-                            VerticalSnapPointsType="{TemplateBinding VerticalSnapPointsType}">
-                            <ScrollContentPresenter.GestureRecognizers>
-                                <ScrollGestureRecognizer
-                                    CanHorizontallyScroll="{Binding CanHorizontallyScroll, ElementName=PART_ContentPresenter}"
-                                    CanVerticallyScroll="{Binding CanVerticallyScroll, ElementName=PART_ContentPresenter}"
-                                    IsScrollInertiaEnabled="{Binding IsScrollInertiaEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
-                            </ScrollContentPresenter.GestureRecognizers>
-                        </ScrollContentPresenter>
-                    </DockPanel>
-                </Border>
+                <DockPanel>
+                    <DockPanel.Styles>
+                        <Style Selector="RepeatButton:pressed">
+                            <Setter Property="RenderTransform" Value="{x:Null}" />
+                        </Style>
+                    </DockPanel.Styles>
+                    <RepeatButton
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Center"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Command="{Binding LineUp, RelativeSource={RelativeSource TemplatedParent}}"
+                        CornerRadius="0"
+                        DockPanel.Dock="Top"
+                        RenderTransform="{x:Null}">
+                        <RepeatButton.IsVisible>
+                            <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="0">
+                                <Binding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                            </MultiBinding>
+                        </RepeatButton.IsVisible>
+                        <PathIcon
+                            Width="8"
+                            Height="8"
+                            Data="{DynamicResource MenuScrollViewerUpButtonGlyph}"
+                            Foreground="{DynamicResource MenuFlyoutScrollViewerIconForeground}" />
+                    </RepeatButton>
+                    <RepeatButton
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Center"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Command="{Binding LineDown, RelativeSource={RelativeSource TemplatedParent}}"
+                        CornerRadius="0"
+                        DockPanel.Dock="Bottom"
+                        RenderTransform="{x:Null}">
+                        <RepeatButton.IsVisible>
+                            <MultiBinding Converter="{x:Static converters:MenuScrollingVisibilityConverter.Instance}" ConverterParameter="100">
+                                <Binding Path="VerticalScrollBarVisibility" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="Offset.Y" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="Extent.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="Viewport.Height" RelativeSource="{RelativeSource TemplatedParent}" />
+                            </MultiBinding>
+                        </RepeatButton.IsVisible>
+                        <PathIcon
+                            Width="8"
+                            Height="8"
+                            Data="{DynamicResource MenuScrollViewerDownButtonGlyph}"
+                            Foreground="{DynamicResource MenuFlyoutScrollViewerIconForeground}" />
+                    </RepeatButton>
+                    <ScrollContentPresenter
+                        Name="PART_ContentPresenter"
+                        Margin="{TemplateBinding Padding}"
+                        HorizontalSnapPointsAlignment="{TemplateBinding HorizontalSnapPointsAlignment}"
+                        HorizontalSnapPointsType="{TemplateBinding HorizontalSnapPointsType}"
+                        VerticalSnapPointsAlignment="{TemplateBinding VerticalSnapPointsAlignment}"
+                        VerticalSnapPointsType="{TemplateBinding VerticalSnapPointsType}">
+                        <ScrollContentPresenter.GestureRecognizers>
+                            <ScrollGestureRecognizer
+                                CanHorizontallyScroll="{Binding CanHorizontallyScroll, ElementName=PART_ContentPresenter}"
+                                CanVerticallyScroll="{Binding CanVerticallyScroll, ElementName=PART_ContentPresenter}"
+                                IsScrollInertiaEnabled="{Binding IsScrollInertiaEnabled, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </ScrollContentPresenter.GestureRecognizers>
+                    </ScrollContentPresenter>
+                </DockPanel>
            </ControlTemplate>
        </Setter>
    </ControlTheme>
@@ -213,7 +203,7 @@
                            BorderThickness="{DynamicResource MenuFlyoutBorderThickness}"
                            BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
                            CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
-                            <ScrollViewer Theme="{StaticResource MenuScrollViewer}" CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
+                            <ScrollViewer Theme="{StaticResource MenuScrollViewer}">
                                <ItemsPresenter
                                    Name="PART_ItemsPresenter"
                                    Grid.IsSharedSizeScope="True"
@@ -337,7 +327,7 @@
                                BorderThickness="{DynamicResource MenuFlyoutBorderThickness}"
                                BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
                                CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
-                                <ScrollViewer Theme="{StaticResource MenuScrollViewer}" CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
+                                <ScrollViewer Theme="{StaticResource MenuScrollViewer}">
                                    <ItemsPresenter
                                        Name="PART_ItemsPresenter"
                                        Grid.IsSharedSizeScope="True"
--- a/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
+++ b/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
@@ -2,21 +2,7 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    x:CompileBindings="True">
-    <Design.PreviewWith>
-        <ThemeVariantScope RequestedThemeVariant="Dark">
-            <MenuFlyoutPresenter>
-                <MenuFlyoutPresenter.Items>
-                    <MenuItem Header="Menu Item 1" />
-                    <MenuItem Header="Menu Item 2" />
-                    <MenuItem Header="Menu Item 3" />
-                    <MenuItem Header="Menu Item 4" />
-                    <MenuItem Header="Menu Item 5" />
-                    <MenuItem Header="Menu Item 6" />
-                </MenuFlyoutPresenter.Items>
-            </MenuFlyoutPresenter>
-        </ThemeVariantScope>
-    </Design.PreviewWith>
-
+    <!--  Add Resources Here  -->
    <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}" TargetType="MenuFlyoutPresenter">
        <Setter Property="MenuFlyoutPresenter.Background" Value="{DynamicResource MenuFlyoutBackground}" />
        <Setter Property="MenuFlyoutPresenter.BorderBrush" Value="{DynamicResource MenuFlyoutBorderBrush}" />
@@ -37,13 +23,12 @@
                    BorderBrush="{TemplateBinding BorderBrush}"
                    BorderThickness="{TemplateBinding BorderThickness}"
                    BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
-                    ClipToBounds="True"
+                    ClipToBounds="False"
                    CornerRadius="{TemplateBinding CornerRadius}"
                    UseLayoutRounding="False">
                    <ScrollViewer
-                        Theme="{StaticResource MenuScrollViewer}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
                        HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                        Theme="{StaticResource MenuScrollViewer}"
                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                        <ItemsPresenter
                            Name="PART_ItemsPresenter"
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -24,6 +24,35 @@
    </MenuFlyout>

    <ControlTheme x:Key="{x:Type TextBox}" TargetType="TextBox">
+        <ControlTheme.Resources>
+            <ControlTheme x:Key="InputToggleButton" TargetType="ToggleButton">
+                <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ButtonInputInnerForeground}" />
+                <Setter Property="ToggleButton.Cursor" Value="Hand" />
+                <Setter Property="ToggleButton.Template">
+                    <ControlTemplate TargetType="ToggleButton">
+                        <!--  Background must be transparent or hit test will fail  -->
+                        <Panel Background="Transparent">
+                            <PathIcon
+                                Width="16"
+                                Height="16"
+                                Data="{DynamicResource PasswordBoxRevealButtonData}"
+                                IsVisible="{Binding $parent[ToggleButton].IsChecked, Converter={x:Static BoolConverters.Not}}" />
+                            <PathIcon
+                                Width="16"
+                                Height="16"
+                                Data="{DynamicResource PasswordBoxHideButtonData}"
+                                IsVisible="{Binding $parent[ToggleButton].IsChecked}" />
+                        </Panel>
+                    </ControlTemplate>
+                </Setter>
+                <Style Selector="^:pointerover">
+                    <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPointeroverForeground}" />
+                </Style>
+                <Style Selector="^:pressed">
+                    <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPressedForeground}" />
+                </Style>
+            </ControlTheme>
+        </ControlTheme.Resources>
        <Setter Property="TextBox.Foreground" Value="{DynamicResource TextBoxForeground}" />
        <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDefaultBackground}" />
        <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
@@ -97,7 +126,8 @@
                                        SelectionEnd="{TemplateBinding SelectionEnd}"
                                        SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
                                        SelectionStart="{TemplateBinding SelectionStart}"
-                                        Text="{TemplateBinding Text, Mode=TwoWay}"
+                                        Text="{TemplateBinding Text,
+                                                               Mode=TwoWay}"
                                        TextAlignment="{TemplateBinding TextAlignment}"
                                        TextWrapping="{TemplateBinding TextWrapping}" />
                                </Panel>
@@ -113,7 +143,8 @@
                                Name="PART_RevealButton"
                                Grid.Column="3"
                                Margin="4,0,0,0"
-                                IsChecked="{TemplateBinding RevealPassword, Mode=TwoWay}"
+                                IsChecked="{TemplateBinding RevealPassword,
+                                                            Mode=TwoWay}"
                                IsVisible="False"
                                Theme="{StaticResource InputToggleButton}" />
                            <ContentPresenter
@@ -222,10 +253,10 @@
        </Style>
        
        <Style Selector="^.TextArea">
-            <Setter Property="AcceptsReturn" Value="True"/>
-            <Setter Property="VerticalContentAlignment" Value="Top"/>
-            <Setter Property="Padding" Value="{DynamicResource TextBoxTextAreaContentPadding}" />
-            <Setter Property="MinHeight" Value="{DynamicResource TextBoxTextAreaHeight}" />
+            <Setter Property="AcceptsReturn" Value="True"></Setter>
+            <Setter Property="VerticalContentAlignment" Value="Top"></Setter>
+            <Setter Property="TextBox.Padding" Value="{DynamicResource TextBoxTextAreaContentPadding}"></Setter>
+            <Setter Property="MinHeight" Value="{DynamicResource TextBoxTextAreaHeight}"></Setter>
        </Style>
    </ControlTheme>

@@ -235,8 +266,8 @@
        <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
        <Setter Property="TextBox.SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
        <Setter Property="TextBox.SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
-        <Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
        <Setter Property="TextBox.BackgroundSizing" Value="OuterBorderEdge" />
+        <Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
        <Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
        <Setter Property="TextBox.FontSize" Value="14" />
        <Setter Property="TextBox.Cursor" Value="Ibeam" />
@@ -259,7 +290,7 @@
                        BorderBrush="{TemplateBinding BorderBrush}"
                        BorderThickness="{TemplateBinding BorderThickness}"
                        CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto,*,Auto, Auto, Auto">
+                        <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
                            <ContentPresenter
                                Grid.Column="0"
                                Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
@@ -278,22 +309,17 @@
                                        Name="PART_Watermark"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        IsVisible="{TemplateBinding Text,
+                                                                    Converter={x:Static StringConverters.IsNullOrEmpty}}"
                                        Opacity="0.5"
                                        Text="{TemplateBinding Watermark}"
                                        TextAlignment="{TemplateBinding TextAlignment}"
-                                        TextWrapping="{TemplateBinding TextWrapping}">
-                                        <TextBlock.IsVisible>
-                                            <MultiBinding Converter="{x:Static BoolConverters.And}">
-                                                <Binding ElementName="PART_TextPresenter" Path="PreeditText" Converter="{x:Static StringConverters.IsNullOrEmpty}"/>
-                                                <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Text" Converter="{x:Static StringConverters.IsNullOrEmpty}"/>
-                                            </MultiBinding>
-                                        </TextBlock.IsVisible>
-                                    </TextBlock>
+                                        TextWrapping="{TemplateBinding TextWrapping}" />
                                    <TextPresenter
                                        Name="PART_TextPresenter"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
                                        CaretBrush="{TemplateBinding CaretBrush}"
                                        CaretIndex="{TemplateBinding CaretIndex}"
                                        LineHeight="{TemplateBinding LineHeight}"
@@ -303,27 +329,14 @@
                                        SelectionEnd="{TemplateBinding SelectionEnd}"
                                        SelectionForegroundBrush="{TemplateBinding SelectionForegroundBrush}"
                                        SelectionStart="{TemplateBinding SelectionStart}"
-                                        Text="{TemplateBinding Text, Mode=TwoWay}"
+                                        Text="{TemplateBinding Text,
+                                                               Mode=TwoWay}"
                                        TextAlignment="{TemplateBinding TextAlignment}"
                                        TextWrapping="{TemplateBinding TextWrapping}" />
                                </Panel>
                            </ScrollViewer>
-                            <Button
-                                Name="PART_ClearButton"
-                                Grid.Column="2"
-                                Command="{Binding $parent[TextBox].Clear}"
-                                Content="{DynamicResource IconButtonClearData}"
-                                IsVisible="False"
-                                Theme="{StaticResource InnerIconButton}" />
-                            <ToggleButton
-                                Name="PART_RevealButton"
-                                Grid.Column="3"
-                                Margin="4,0,0,0"
-                                IsChecked="{TemplateBinding RevealPassword, Mode=TwoWay}"
-                                IsVisible="False"
-                                Theme="{StaticResource InputToggleButton}" />
                            <ContentPresenter
-                                Grid.Column="4"
+                                Grid.Column="2"
                                Padding="{DynamicResource TextBoxInnerRightContentPadding}"
                                VerticalAlignment="Center"
                                Content="{TemplateBinding InnerRightContent}"
@@ -370,69 +383,6 @@
                <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
            </Style>
        </Style>
-
-        <Style Selector="^.clearButton, ^.ClearButton">
-            <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-            <Style Selector="^[AcceptsReturn=False][IsReadOnly=False]:pointerover:not(:empty) /template/ Button#PART_ClearButton">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-        </Style>
-        <Style Selector="^.revealPasswordButton, ^.RevealPasswordButton">
-            <Style Selector="^ /template/ ToggleButton#PART_RevealButton">
-                <Setter Property="IsVisible" Value="True" />
-            </Style>
-        </Style>
-        <Style Selector="^.Large">
-            <Setter Property="MinHeight" Value="{DynamicResource TextBoxLargeHeight}" />
-        </Style>
-        <Style Selector="^.Small">
-            <Setter Property="MinHeight" Value="{DynamicResource TextBoxSmallHeight}" />
-        </Style>
-
-        <Style Selector="^.Bordered">
-            <Setter Property="Background" Value="{DynamicResource TextBoxBorderedDefaultBackground}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderedDefaultBorderBrush}" />
-            <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="Background" Value="{DynamicResource TextBoxBorderedPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderedPointeroverBorderBrush}" />
-            </Style>
-            <Style Selector="^:focus">
-                <Setter Property="Background" Value="{DynamicResource TextBoxBorderedPointeroverBackground}" />
-                <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderedPointeroverBorderBrush}" />
-            </Style>
-            <Style Selector="^:disabled /template/ Border#PART_ContentPresenterBorder">
-                <Setter Property="TextBox.Background" Value="{DynamicResource TextBoxDisabledBackground}" />
-                <Setter Property="TextBox.BorderBrush" Value="{DynamicResource TextBoxDisabledBorderBrush}" />
-            </Style>
-
-            <Style Selector="^:error">
-                <Style Selector="^ /template/ Border#PART_ContentPresenterBorder">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsBorderBrush}" />
-                </Style>
-                <Style Selector="^:pointerover /template/ Border#PART_ContentPresenterBorder">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPointerOverBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPointerOverBorderBrush}" />
-                </Style>
-                <Style Selector="^:pressed /template/ Border#PART_ContentPresenterBorder">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsPressedBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsPressedBorderBrush}" />
-                </Style>
-                <Style Selector="^:focus /template/ Border#PART_ContentPresenterBorder">
-                    <Setter Property="Background" Value="{DynamicResource DataValidationErrorsSelectedBackground}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource DataValidationErrorsSelectedBorderBrush}" />
-                </Style>
-            </Style>
-        </Style>
-
-        <Style Selector="^.TextArea">
-            <Setter Property="AcceptsReturn" Value="True"/>
-            <Setter Property="VerticalContentAlignment" Value="Top"/>
-            <Setter Property="Padding" Value="{DynamicResource TextBoxTextAreaContentPadding}" />
-            <Setter Property="MinHeight" Value="{DynamicResource TextBoxTextAreaHeight}" />
-        </Style>
    </ControlTheme>

    <ControlTheme x:Key="LooklessTextBox" TargetType="TextBox">
@@ -510,32 +460,4 @@
        </Style>
    </ControlTheme>

-    <ControlTheme x:Key="InputToggleButton" TargetType="ToggleButton">
-        <Setter Property="ToggleButton.Foreground" Value="{DynamicResource ButtonInputInnerForeground}" />
-        <Setter Property="ToggleButton.Cursor" Value="Hand" />
-        <Setter Property="ToggleButton.Template">
-            <ControlTemplate TargetType="ToggleButton">
-                <!--  Background must be transparent or hit test will fail  -->
-                <Panel Background="Transparent">
-                    <PathIcon
-                        Width="16"
-                        Height="16"
-                        Data="{DynamicResource PasswordBoxRevealButtonData}"
-                        IsVisible="{Binding $parent[ToggleButton].IsChecked, Converter={x:Static BoolConverters.Not}}" />
-                    <PathIcon
-                        Width="16"
-                        Height="16"
-                        Data="{DynamicResource PasswordBoxHideButtonData}"
-                        IsVisible="{Binding $parent[ToggleButton].IsChecked}" />
-                </Panel>
-            </ControlTemplate>
-        </Setter>
-        <Style Selector="^:pointerover">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPointeroverForeground}" />
-        </Style>
-        <Style Selector="^:pressed">
-            <Setter Property="Foreground" Value="{DynamicResource ButtonInputInnerPressedForeground}" />
-        </Style>
-    </ControlTheme>
-
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Locale/en-us.axaml
+++ b/src/Semi.Avalonia/Locale/en-us.axaml
@@ -21,5 +21,4 @@
    <x:String x:Key="STRING_CHOOSER_DATEMODIFIED_COLUMN">Date Modified</x:String>
    <x:String x:Key="STRING_CHOOSER_TYPE_COLUMN">Type</x:String>
    <x:String x:Key="STRING_CHOOSER_SIZE_COLUMN">Size</x:String>
-    <x:String x:Key="STRING_CHOOSER_PROMPT_FILE_ALREADY_EXISTS">{0} already exists. Do you want to replace it?</x:String>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Locale/ja-jp.axaml
+++ b/src/Semi.Avalonia/Locale/ja-jp.axaml
@@ -21,5 +21,4 @@
    <x:String x:Key="STRING_CHOOSER_DATEMODIFIED_COLUMN">更新日時</x:String>
    <x:String x:Key="STRING_CHOOSER_TYPE_COLUMN">種類</x:String>
    <x:String x:Key="STRING_CHOOSER_SIZE_COLUMN">サイズ</x:String>
-    <x:String x:Key="STRING_CHOOSER_PROMPT_FILE_ALREADY_EXISTS">{0} はすでに存在します。置き換えますか？</x:String>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Locale/ru-ru.axaml
+++ b/src/Semi.Avalonia/Locale/ru-ru.axaml
@@ -8,8 +8,7 @@
    <!-- TimePicker -->
    <x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">часы</x:String>
    <x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">минуты</x:String>
-    <x:String x:Key="STRING_TIMEPICKER_SECOND_TEXT">секунды</x:String>
-	<!-- TextBox/SelectableTextBox flyout -->
+    <!-- TextBox/SelectableTextBox flyout -->
    <x:String x:Key="STRING_MENU_CUT">Вырезать</x:String>
    <x:String x:Key="STRING_MENU_COPY">Копировать</x:String>
    <x:String x:Key="STRING_MENU_PASTE">Вставить</x:String>
@@ -17,10 +16,9 @@
    <x:String x:Key="STRING_CHOOSER_FILE_NAME">Имя файла</x:String>
    <x:String x:Key="STRING_CHOOSER_SHOW_HIDDEN_FILES">Показать скрытые файлы</x:String>
    <x:String x:Key="STRING_CHOOSER_DIALOG_OK">OK</x:String>
-    <x:String x:Key="STRING_CHOOSER_DIALOG_CANCEL">Отмена</x:String>
+    <x:String x:Key="STRING_CHOOSER_DIALOG_CANCEL">Cancel</x:String>
    <x:String x:Key="STRING_CHOOSER_NAME_COLUMN">Имя</x:String>
    <x:String x:Key="STRING_CHOOSER_DATEMODIFIED_COLUMN">Дата изменения</x:String>
    <x:String x:Key="STRING_CHOOSER_TYPE_COLUMN">Тип</x:String>
    <x:String x:Key="STRING_CHOOSER_SIZE_COLUMN">Размер</x:String>
-    <x:String x:Key="STRING_CHOOSER_PROMPT_FILE_ALREADY_EXISTS">{0} уже существует. Вы хотите заменить его?</x:String>
 </ResourceDictionary>
--- a/src/Semi.Avalonia/Locale/zh-cn.axaml
+++ b/src/Semi.Avalonia/Locale/zh-cn.axaml
@@ -21,5 +21,4 @@
    <x:String x:Key="STRING_CHOOSER_DATEMODIFIED_COLUMN">修改日期</x:String>
    <x:String x:Key="STRING_CHOOSER_TYPE_COLUMN">类型</x:String>
    <x:String x:Key="STRING_CHOOSER_SIZE_COLUMN">大小</x:String>
-    <x:String x:Key="STRING_CHOOSER_PROMPT_FILE_ALREADY_EXISTS">{0} 已经存在。您要替换它吗？</x:String>
 </ResourceDictionary>
--- 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.3</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1.0.2</PackageReleaseNotes>
    </PropertyGroup>

    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
--- a/src/Semi.Avalonia/Themes/Shared/Menu.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Menu.axaml
@@ -6,7 +6,7 @@

    <!--  MenuFlyout  -->
    <Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
-    <Thickness x:Key="MenuFlyoutPadding">0</Thickness>
+    <Thickness x:Key="MenuFlyoutPadding">8</Thickness>
    <CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
    <x:Double x:Key="MenuFlyoutMinHeight">16</x:Double>
    <x:Double x:Key="MenuFlyoutMinWidth">100</x:Double>