gallery(Form): 修复登录表单选项行布局并补回归测试

controlgallery/AtomUIGallery/ShowCases/DataEntry/Form/ShowCaseControls/FormThemes.axaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:atom="https://atomui.net"
                     x:ClassModifier="internal">
     <ResourceDictionary.MergedDictionaries>
         <ResourceInclude Source="PriceInputTheme.axaml"/>
@@ -7,4 +8,23 @@
         <ResourceInclude Source="DonationTheme.axaml"/>
         <ResourceInclude Source="CaptchaTheme.axaml"/>
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+
+    <ControlTheme x:Key="LoginOptionsDecoratorTheme"
+                  TargetType="atom:FormItemDecorator"
+                  BasedOn="{StaticResource {x:Type atom:FormItemDecorator}}">
+        <Setter Property="Template">
+            <ControlTemplate>
+                <Grid ColumnDefinitions="*,Auto">
+                    <ContentPresenter Content="{TemplateBinding Child}"
+                                      VerticalContentAlignment="Center" />
+                    <ContentPresenter Grid.Column="1"
+                                      Content="{TemplateBinding Extra}"
+                                      ContentTemplate="{TemplateBinding ExtraTemplate}"
+                                      HorizontalAlignment="Right"
+                                      HorizontalContentAlignment="Right"
+                                      VerticalContentAlignment="Center" />
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>

controlgallery/AtomUIGallery/ShowCases/DataEntry/Form/Views/FormShowCase.axaml

@@ -1384,10 +1384,16 @@
                                PlaceholderText="{gallery:FormShowCaseLangResource P2PlaceholderTextPassword}"/>
             </atom:FormItem>
             <atom:FormItem FieldName="remember">
-                <atom:CheckBox IsChecked="True" Content="{gallery:FormShowCaseLangResource P2ContentRememberMe}" />
-                <atom:FormItem.Extra>
-                    <atom:HyperLinkButton Content="{gallery:FormShowCaseLangResource P2ContentForgotPassword}" />
-                </atom:FormItem.Extra>
+                <atom:FormItemDecorator HorizontalAlignment="Stretch"
+                                        Theme="{StaticResource LoginOptionsDecoratorTheme}">
+                    <atom:CheckBox IsChecked="True"
+                                   Content="{gallery:FormShowCaseLangResource P2ContentRememberMe}" />
+                    <atom:FormItemDecorator.Extra>
+                        <atom:HyperLinkTextBlock HorizontalAlignment="Right"
+                                                 Focusable="True"
+                                                 Text="{gallery:FormShowCaseLangResource P2ContentForgotPassword}" />
+                    </atom:FormItemDecorator.Extra>
+                </atom:FormItemDecorator>
             </atom:FormItem>
             <atom:FormActionsItem>
                 <StackPanel>