UI-调整偏好设置弹窗结构

PDF Office/Views/Dialog/InfoDialog.xaml

@@ -10,7 +10,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     Width="700"
-    Height="673"
+    Height="600"
     d:DataContext="{d:DesignInstance Type=dialog:InfoDialogViewModel}"
     d:DesignHeight="673"
     d:DesignWidth="700"
@@ -113,7 +113,7 @@
             </Style>
         </ResourceDictionary>
     </Window.Resources>
-    <Grid Width="700" Height="673">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="40" />
             <RowDefinition />
@@ -136,7 +136,7 @@
                             Text="General" />
                     </StackPanel>
                 </TabItem.Header>
-                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                <ScrollViewer Margin="0,0,0,80" VerticalScrollBarVisibility="Auto">
                     <StackPanel Margin="16,10,10,0" Background="{StaticResource color.sys.layout.anti}">
                         <Label Content="文档" Style="{StaticResource Label}" />
                         <StackPanel Margin="0,10,0,18" Background="{StaticResource color.sys.layout.mg}">
@@ -258,23 +258,6 @@
                                     Style="{DynamicResource RadioButtonStyle1}" />
                             </WrapPanel>
                         </StackPanel>
-                        <WrapPanel Margin="5,28,10,10" VerticalAlignment="Bottom">
-                            <Button
-                                Width="120"
-                                Height="32"
-                                Margin="0,0,16,0"
-                                Content="重置"
-                                FontSize="14"
-                                Foreground="{StaticResource color.btn.sec.text.def}"
-                                Style="{StaticResource btn.sec}" />
-                            <Button
-                                Width="120"
-                                Height="32"
-                                Content="重置全部"
-                                FontSize="14"
-                                Foreground="{StaticResource color.btn.sec.text.def}"
-                                Style="{StaticResource btn.sec}" />
-                        </WrapPanel>
                     </StackPanel>
                 </ScrollViewer>
             </TabItem>
@@ -291,7 +274,7 @@
                             Text="Display" />
                     </StackPanel>
                 </TabItem.Header>
-                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                <ScrollViewer Margin="0,0,0,80" VerticalScrollBarVisibility="Auto">
                     <StackPanel Margin="16,10,10,0" Background="{StaticResource color.sys.layout.anti}">
                         <Label Content="默认视图和缩放" Style="{StaticResource Label}" />
                         <Grid Margin="0,5,0,10" Background="{StaticResource color.sys.layout.mg}">
@@ -443,23 +426,6 @@
                             Margin="5,0,0,8"
                             Content="高亮链接"
                             Foreground="{StaticResource color.sys.text.neutral.lv1}" />
-                        <WrapPanel Margin="5,8,10,10" VerticalAlignment="Bottom">
-                            <Button
-                                Width="120"
-                                Height="32"
-                                Margin="0,0,16,0"
-                                Content="重置"
-                                FontSize="14"
-                                Foreground="{StaticResource color.btn.sec.text.def}"
-                                Style="{StaticResource btn.sec}" />
-                            <Button
-                                Width="120"
-                                Height="32"
-                                Content="重置全部"
-                                FontSize="14"
-                                Foreground="{StaticResource color.btn.sec.text.def}"
-                                Style="{StaticResource btn.sec}" />
-                        </WrapPanel>
                     </StackPanel>
                 </ScrollViewer>
             </TabItem>
@@ -476,7 +442,7 @@
                             Text="Markup" />
                     </StackPanel>
                 </TabItem.Header>
-                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                <ScrollViewer Margin="0,0,0,80" VerticalScrollBarVisibility="Auto">
                     <StackPanel Margin="16,10,10,0">
                         <Label Content="注释默认颜色" Style="{StaticResource Label}" />
                         <Grid Margin="0,8" Background="{StaticResource color.sys.layout.mg}">
@@ -777,24 +743,6 @@
                                 </ComboBox>
                             </WrapPanel>
                         </WrapPanel>
-
-                        <WrapPanel Margin="5,89,10,10" VerticalAlignment="Bottom">
-                            <Button
-                                Width="120"
-                                Height="32"
-                                Margin="0,0,16,0"
-                                Content="重置"
-                                FontSize="14"
-                                Foreground="{StaticResource color.btn.sec.text.def}"
-                                Style="{StaticResource btn.sec}" />
-                            <Button
-                                Width="120"
-                                Height="32"
-                                Content="重置全部"
-                                FontSize="14"
-                                Foreground="{StaticResource color.btn.sec.text.def}"
-                                Style="{StaticResource btn.sec}" />
-                        </WrapPanel>
                     </StackPanel>
                 </ScrollViewer>
             </TabItem>
@@ -824,6 +772,28 @@
                 </StackPanel>
             </TabItem>
         </TabControl>
+        <WrapPanel
+            Grid.Row="1"
+            Width="494"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Bottom"
+            Background="{StaticResource color.sys.layout.anti}">
+            <Button
+                Width="120"
+                Height="32"
+                Margin="16,24"
+                Content="重置"
+                FontSize="14"
+                Foreground="{StaticResource color.btn.sec.text.def}"
+                Style="{StaticResource btn.sec}" />
+            <Button
+                Width="120"
+                Height="32"
+                Content="重置全部"
+                FontSize="14"
+                Foreground="{StaticResource color.btn.sec.text.def}"
+                Style="{StaticResource btn.sec}" />
+        </WrapPanel>
         <StackPanel
             VerticalAlignment="Top"
             Background="{StaticResource color.sys.layout.bg.tabbar}"