From c2a072041d8ea1a9d45dbb6bd1bdffcc156c6969 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 25 Jul 2025 06:43:39 +0000
Subject: [PATCH] Remove AcceptsReturn=False condition and add TextArea
 ClearButton top alignment

Co-authored-by: zdpcdt <54255897+zdpcdt@users.noreply.github.com>
---
 src/Semi.Avalonia/Controls/TextBox.axaml | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/TextBox.axaml b/src/Semi.Avalonia/Controls/TextBox.axaml
index b213046..4870bc5 100644
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -163,14 +163,6 @@
         </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="^.TextArea.clearButton, ^.TextArea.ClearButton">
             <Style Selector="^[IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
                 <Setter Property="IsVisible" Value="True" />
             </Style>
@@ -178,6 +170,9 @@
                 <Setter Property="IsVisible" Value="True" />
             </Style>
         </Style>
+        <Style Selector="^.TextArea.clearButton /template/ Button#PART_ClearButton, ^.TextArea.ClearButton /template/ Button#PART_ClearButton">
+            <Setter Property="VerticalAlignment" Value="Top" />
+        </Style>
         <Style Selector="^.revealPasswordButton, ^.RevealPasswordButton">
             <Setter Property="PasswordChar" Value="•" />
             <Style Selector="^ /template/ ToggleButton#PART_RevealButton">
@@ -379,14 +374,6 @@
         </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="^.TextArea.clearButton, ^.TextArea.ClearButton">
             <Style Selector="^[IsReadOnly=False]:focus:not(:empty) /template/ Button#PART_ClearButton">
                 <Setter Property="IsVisible" Value="True" />
             </Style>
@@ -394,6 +381,9 @@
                 <Setter Property="IsVisible" Value="True" />
             </Style>
         </Style>
+        <Style Selector="^.TextArea.clearButton /template/ Button#PART_ClearButton, ^.TextArea.ClearButton /template/ Button#PART_ClearButton">
+            <Setter Property="VerticalAlignment" Value="Top" />
+        </Style>
         <Style Selector="^.revealPasswordButton, ^.RevealPasswordButton">
             <Setter Property="PasswordChar" Value="•" />
             <Style Selector="^ /template/ ToggleButton#PART_RevealButton">