feat: bump version.

feat: sync upstream.
feat: upgrade to 11.2.0-beta1
2026-03-03 00:00:55 +08:00 · 2024-09-01 09:52:15 +08:00 · 2024-09-01 09:51:12 +08:00 · 2024-09-01 09:51:12 +08:00 · 2024-08-30 17:27:34 +08:00 · 2024-08-30 16:59:54 +08:00
21 changed files with 349 additions and 159 deletions
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
    <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.1.3</AvaloniaVersion>
+    <AvaloniaVersion>11.2.0-beta1</AvaloniaVersion>
  </PropertyGroup>
 </Project>
--- 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="openFileDialog">Open File</Button>
-        <Button Name="selectFolderDialog">Select Folder</Button>
-        <Button Name="saveFileDialog">Save File</Button>
+        <Button Name="OpenFileButton" Content="Open File" />
+        <Button Name="SelectFolderButton" Content="Select Folder" />
+        <Button Name="SaveFileButton" Content="Save File" />
    </StackPanel>
 </UserControl>
--- a/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml.cs
+++ b/demo/Semi.Avalonia.Demo/Pages/ManagedFileChooserDemo.axaml.cs
@@ -1,10 +1,6 @@
-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;
@@ -14,14 +10,14 @@ public partial class ManagedFileChooserDemo : UserControl
    public ManagedFileChooserDemo()
    {
        InitializeComponent();
-        openFileDialog.Click += OpenFileDialog;
-        selectFolderDialog.Click += SelectFolderDialog;
-        saveFileDialog.Click += SaveFileDialog;
+        OpenFileButton.Click += OpenFileDialog;
+        SelectFolderButton.Click += SelectFolderDialog;
+        SaveFileButton.Click += SaveFileDialog;
    }

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

    List<FilePickerFileType>? GetFileTypes()
    {
-        return new List<FilePickerFileType>
-        {
+        return
+        [
            FilePickerFileTypes.All,
            FilePickerFileTypes.TextPlain
-        };
+        ];
    }
 }
--- a/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml
+++ b/demo/Semi.Avalonia.Demo/Pages/TimePickerDemo.axaml
@@ -9,6 +9,7 @@
    mc:Ignorable="d">
    <StackPanel Spacing="20">
        <TimePicker />
+        <TimePicker UseSeconds="True" />
        <TimePicker Classes="ClearButton" />
        <TimePicker MinuteIncrement="15" />
        <TimePicker ClockIdentifier="24HourClock" />
--- a/src/Package.props
+++ b/src/Package.props
@@ -3,14 +3,14 @@
        <TargetFrameworks>net6.0;net8.0;netstandard2.0</TargetFrameworks>
        <Nullable>enable</Nullable>
        <LangVersion>latest</LangVersion>
-        <Version>11.1.0.2</Version>
+        <Version>11.2.0-beta1</Version>
        <Authors>IRIHI Technology Co., Ltd.</Authors>
        <Description>Avalonia Theme inspired by Semi Design.</Description>
        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
        <PackageIcon>irihi.png</PackageIcon>
        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
-        <AvaloniaVersion>11.1.0</AvaloniaVersion>
+        <AvaloniaVersion>11.2.0-beta1</AvaloniaVersion>
    </PropertyGroup>

    <ItemGroup>
--- 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.2</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1.0.3</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.2</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1.0.3</PackageReleaseNotes>
    </PropertyGroup>

    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
--- a/src/Semi.Avalonia/Controls/Carousel.axaml
+++ b/src/Semi.Avalonia/Controls/Carousel.axaml
@@ -13,6 +13,7 @@
                    Background="{TemplateBinding Background}"
                    BorderBrush="{TemplateBinding BorderBrush}"
                    BorderThickness="{TemplateBinding BorderThickness}"
+                    BringIntoViewOnFocusChange="True"
                    HorizontalScrollBarVisibility="Hidden"
                    VerticalScrollBarVisibility="Hidden">
                    <ItemsPresenter
@@ -66,8 +67,7 @@
                            Name="Container"
                            Width="{DynamicResource CarouselIndicatorLineWidth}"
                            Height="{DynamicResource CarouselIndicatorLineHeight}"
-                            Background="{TemplateBinding Background}">
-                        </Border>
+                            Background="{TemplateBinding Background}" />
                    </Border>
                </Panel>
            </ControlTemplate>
@@ -90,8 +90,7 @@
            <ControlTemplate TargetType="ListBoxItem">
                <Panel Background="Transparent">
                    <Border Padding="2,0" Background="Transparent">
-                        <Border Width="{DynamicResource CarouselIndicatorColumnarWidth}"
-                                Height="{DynamicResource CarouselIndicatorColumnarSelectedHeight}">
+                        <Border Width="{DynamicResource CarouselIndicatorColumnarWidth}" Height="{DynamicResource CarouselIndicatorColumnarSelectedHeight}">
                            <Rectangle
                                Name="Container"
                                Width="{DynamicResource CarouselIndicatorColumnarWidth}"
@@ -100,7 +99,7 @@
                                Fill="{TemplateBinding Background}">
                                <Rectangle.Transitions>
                                    <Transitions>
-                                        <DoubleTransition Property="Height" Duration="0:0:0.2"></DoubleTransition>
+                                        <DoubleTransition Property="Height" Duration="0:0:0.2" />
                                    </Transitions>
                                </Rectangle.Transitions>
                            </Rectangle>
--- a/src/Semi.Avalonia/Controls/ContextMenu.axaml
+++ b/src/Semi.Avalonia/Controls/ContextMenu.axaml
@@ -10,6 +10,7 @@
        <Setter Property="ContextMenu.MaxWidth" Value="{DynamicResource MenuFlyoutMaxWidth}" />
        <Setter Property="ContextMenu.MinHeight" Value="{DynamicResource MenuFlyoutMinHeight}" />
        <Setter Property="ContextMenu.Padding" Value="{DynamicResource MenuFlyoutPadding}" />
+        <Setter Property="Focusable" Value="True"></Setter>
        <Setter Property="ContextMenu.HorizontalAlignment" Value="Stretch" />
        <Setter Property="TextBlock.FontWeight" Value="Normal" />
        <Setter Property="ContextMenu.WindowManagerAddShadowHint" Value="False" />
@@ -26,7 +27,7 @@
                    BorderThickness="{TemplateBinding BorderThickness}"
                    BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
                    CornerRadius="{TemplateBinding CornerRadius}">
-                    <ScrollViewer Theme="{DynamicResource MenuScrollViewer}">
+                    <ScrollViewer Theme="{DynamicResource MenuScrollViewer}" CornerRadius="{TemplateBinding CornerRadius}">
                        <ItemsPresenter
                            Name="PART_ItemsPresenter"
                            Grid.IsSharedSizeScope="True"
--- a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
@@ -4,6 +4,7 @@
    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>
@@ -194,4 +195,46 @@
            </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,73 +10,83 @@
        <Setter Property="Background" Value="Transparent" />
        <Setter Property="Template">
            <ControlTemplate TargetType="ScrollViewer">
-                <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 
+                    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>
            </ControlTemplate>
        </Setter>
    </ControlTheme>
@@ -203,7 +213,7 @@
                            BorderThickness="{DynamicResource MenuFlyoutBorderThickness}"
                            BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
                            CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
-                            <ScrollViewer Theme="{StaticResource MenuScrollViewer}">
+                            <ScrollViewer Theme="{StaticResource MenuScrollViewer}" CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
                                <ItemsPresenter
                                    Name="PART_ItemsPresenter"
                                    Grid.IsSharedSizeScope="True"
@@ -327,7 +337,7 @@
                                BorderThickness="{DynamicResource MenuFlyoutBorderThickness}"
                                BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
                                CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
-                                <ScrollViewer Theme="{StaticResource MenuScrollViewer}">
+                                <ScrollViewer Theme="{StaticResource MenuScrollViewer}" CornerRadius="{DynamicResource MenuFlyoutCornerRadius}">
                                    <ItemsPresenter
                                        Name="PART_ItemsPresenter"
                                        Grid.IsSharedSizeScope="True"
--- a/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
+++ b/src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
@@ -2,7 +2,21 @@
    xmlns="https://github.com/avaloniaui"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    x:CompileBindings="True">
-    <!--  Add Resources Here  -->
+    <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>
+
    <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}" TargetType="MenuFlyoutPresenter">
        <Setter Property="MenuFlyoutPresenter.Background" Value="{DynamicResource MenuFlyoutBackground}" />
        <Setter Property="MenuFlyoutPresenter.BorderBrush" Value="{DynamicResource MenuFlyoutBorderBrush}" />
@@ -23,12 +37,13 @@
                    BorderBrush="{TemplateBinding BorderBrush}"
                    BorderThickness="{TemplateBinding BorderThickness}"
                    BoxShadow="{DynamicResource MenuFlyoutBorderBoxShadow}"
-                    ClipToBounds="False"
+                    ClipToBounds="True"
                    CornerRadius="{TemplateBinding CornerRadius}"
                    UseLayoutRounding="False">
                    <ScrollViewer
-                        HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                        Theme="{StaticResource MenuScrollViewer}"
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                        <ItemsPresenter
                            Name="PART_ItemsPresenter"
--- a/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
+++ b/src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
@@ -5,7 +5,6 @@

    <MenuFlyout x:Key="SelectableTextBlockContextFlyout" Placement="Bottom">
        <MenuItem
-            x:Name="SelectableTextBlockContextFlyoutCopyItem"
            Command="{Binding $parent[SelectableTextBlock].Copy}"
            Header="{DynamicResource STRING_MENU_COPY}"
            InputGesture="{x:Static TextBox.CopyGesture}"
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -4,19 +4,16 @@
    x:CompileBindings="True">
    <MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
        <MenuItem
-            x:Name="TextBoxContextFlyoutCutItem"
            Command="{Binding $parent[TextBox].Cut}"
            Header="{DynamicResource STRING_MENU_CUT}"
            InputGesture="{x:Static TextBox.CutGesture}"
            IsEnabled="{Binding $parent[TextBox].CanCut}" />
        <MenuItem
-            x:Name="TextBoxContextFlyoutCopyItem"
            Command="{Binding $parent[TextBox].Copy}"
            Header="{DynamicResource STRING_MENU_COPY}"
            InputGesture="{x:Static TextBox.CopyGesture}"
            IsEnabled="{Binding $parent[TextBox].CanCopy}" />
        <MenuItem
-            x:Name="TextBoxContextFlyoutPasteItem"
            Command="{Binding $parent[TextBox].Paste}"
            Header="{DynamicResource STRING_MENU_PASTE}"
            InputGesture="{x:Static TextBox.PasteGesture}"
@@ -24,35 +21,6 @@
    </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}" />
@@ -126,8 +94,7 @@
                                        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>
@@ -143,8 +110,7 @@
                                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
@@ -253,10 +219,10 @@
        </Style>
        
        <Style Selector="^.TextArea">
-            <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>
+            <Setter Property="AcceptsReturn" Value="True"/>
+            <Setter Property="VerticalContentAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="{DynamicResource TextBoxTextAreaContentPadding}" />
+            <Setter Property="MinHeight" Value="{DynamicResource TextBoxTextAreaHeight}" />
        </Style>
    </ControlTheme>

@@ -266,8 +232,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.BackgroundSizing" Value="OuterBorderEdge" />
        <Setter Property="TextBox.BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
+        <Setter Property="TextBox.BackgroundSizing" Value="OuterBorderEdge" />
        <Setter Property="TextBox.CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
        <Setter Property="TextBox.FontSize" Value="14" />
        <Setter Property="TextBox.Cursor" Value="Ibeam" />
@@ -290,7 +256,7 @@
                        BorderBrush="{TemplateBinding BorderBrush}"
                        BorderThickness="{TemplateBinding BorderThickness}"
                        CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
+                        <Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto,*,Auto, Auto, Auto">
                            <ContentPresenter
                                Grid.Column="0"
                                Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
@@ -309,17 +275,22 @@
                                        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}" />
+                                        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>
                                    <TextPresenter
                                        Name="PART_TextPresenter"
                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        CaretBlinkInterval="{TemplateBinding CaretBlinkInterval}"
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                        CaretBrush="{TemplateBinding CaretBrush}"
                                        CaretIndex="{TemplateBinding CaretIndex}"
                                        LineHeight="{TemplateBinding LineHeight}"
@@ -329,14 +300,27 @@
                                        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>
-                            <ContentPresenter
+                            <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"
                                Padding="{DynamicResource TextBoxInnerRightContentPadding}"
                                VerticalAlignment="Center"
                                Content="{TemplateBinding InnerRightContent}"
@@ -383,6 +367,69 @@
                <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">
@@ -460,4 +507,32 @@
        </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/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -54,8 +54,20 @@
                                <RepeatButton Name="PART_MinuteUpButton" Theme="{StaticResource DateTimePickerUpButton}" />
                                <RepeatButton Name="PART_MinuteDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
                            </Panel>
+                            
+                            <Panel Name="PART_SecondHost" Grid.Column="4">
+                                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
+                                    <DateTimePickerPanel
+                                        Name="PART_SecondSelector"
+                                        ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}"
+                                        PanelType="Second"
+                                        ShouldLoop="True" />
+                                </ScrollViewer>
+                                <RepeatButton Name="PART_SecondUpButton" Theme="{StaticResource DateTimePickerUpButton}" />
+                                <RepeatButton Name="PART_SecondDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
+                            </Panel>

-                            <Panel Name="PART_PeriodHost" Grid.Column="4">
+                            <Panel Name="PART_PeriodHost" Grid.Column="6">
                                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
                                    <DateTimePickerPanel
                                        Name="PART_PeriodSelector"
@@ -81,6 +93,13 @@
                                Margin="0,4"
                                HorizontalAlignment="Center"
                                Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
+                            <Rectangle
+                                Name="PART_ThirdSpacer"
+                                Grid.Column="5"
+                                Width="1"
+                                Margin="0,4"
+                                HorizontalAlignment="Center"
+                                Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
                        </Grid>

                        <Grid
@@ -216,6 +235,29 @@
                                        Grid.Column="4"
                                        HorizontalAlignment="Stretch"
                                        VerticalAlignment="Stretch">
+                                        <TextBlock
+                                            x:Name="PART_SecondTextBlock"
+                                            Padding="12,0"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            FontFamily="{TemplateBinding FontFamily}"
+                                            FontSize="{TemplateBinding FontSize}"
+                                            FontWeight="{TemplateBinding FontWeight}"
+                                            Text="{DynamicResource STRING_TIMEPICKER_SECOND_TEXT}"/>
+                                    </Border>
+                                    
+                                    <Rectangle
+                                        Name="PART_ThirdColumnDivider"
+                                        Grid.Column="5"
+                                        Width="1"
+                                        HorizontalAlignment="Center"
+                                        Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
+
+                                    <Border
+                                        x:Name="PART_FourthPickerHost"
+                                        Grid.Column="6"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch">
                                        <TextBlock
                                            x:Name="PART_PeriodTextBlock"
                                            Padding="12,0"
--- a/src/Semi.Avalonia/Locale/en-us.axaml
+++ b/src/Semi.Avalonia/Locale/en-us.axaml
@@ -8,6 +8,7 @@
    <!-- TimePicker -->
    <x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">hour</x:String>
    <x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">minute</x:String>
+    <x:String x:Key="STRING_TIMEPICKER_SECOND_TEXT">second</x:String>
    <!-- TextBox/SelectableTextBox flyout -->
    <x:String x:Key="STRING_MENU_CUT">Cut</x:String>
    <x:String x:Key="STRING_MENU_COPY">Copy</x:String>
@@ -21,4 +22,5 @@
    <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,4 +21,5 @@
    <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,7 +8,8 @@
    <!-- TimePicker -->
    <x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">часы</x:String>
    <x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">минуты</x:String>
-    <!-- TextBox/SelectableTextBox flyout -->
+    <x:String x:Key="STRING_TIMEPICKER_SECOND_TEXT">секунды</x:String>
+	<!-- 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>
@@ -16,9 +17,10 @@
    <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">Cancel</x:String>
+    <x:String x:Key="STRING_CHOOSER_DIALOG_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
@@ -8,6 +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 -->
    <x:String x:Key="STRING_MENU_CUT">剪切</x:String>
    <x:String x:Key="STRING_MENU_COPY">复制</x:String>
@@ -21,4 +22,5 @@
    <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.2</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1.0.3</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">8</Thickness>
+    <Thickness x:Key="MenuFlyoutPadding">0</Thickness>
    <CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
    <x:Double x:Key="MenuFlyoutMinHeight">16</x:Double>
    <x:Double x:Key="MenuFlyoutMinWidth">100</x:Double>
Author	SHA1	Message	Date
rabbitism	8a7b8715c9	feat: bump version.	2024-09-01 09:52:15 +08:00
rabbitism	7da5934684	feat: sync upstream.	2024-09-01 09:51:12 +08:00
rabbitism	52afd97a94	feat: upgrade to 11.2.0-beta1	2024-09-01 09:51:12 +08:00
Zhang Dian	f2bb8d848a	misc: bump version.	2024-08-30 17:27:34 +08:00
Darth-Lexx	c3257d97fa	Rul Locale update	2024-08-30 16:59:54 +08:00
Dong Bin	b9a1b2c81e	Merge pull request #425 from irihitech/issue/194 remove DropDown List padding	2024-08-30 16:46:06 +08:00
rabbitism	52a25d8441	feat: set corners for scrollviewer.	2024-08-30 16:06:26 +08:00
Zhang Dian	4bd73119ac	fix: remove MenuFlyoutPadding.	2024-08-30 16:00:58 +08:00
Dong Bin	210b74aef6	Merge pull request #424 from irihitech/NonErrorTextBox Unify NonErrorTextBox styles with default TextBox styles	2024-08-29 18:20:49 +08:00
Zhang Dian	d27acf269e	feat: update NonErrorTextBox.	2024-08-29 16:14:49 +08:00
Dong Bin	40d7fbcf7f	Merge pull request #423 from irihitech/issue/422 Add ManagedFileChooserOverwritePrompt Styles	2024-08-27 12:20:17 +08:00
Zhang Dian	e4c21aefc6	fix: add ManagedFileChooserOverwritePrompt styles.	2024-08-26 20:16:46 +08:00