Bläddra i källkod

Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

ZhouJieSheng 1 år sedan
förälder
incheckning
6230fec051

+ 9 - 5
PDF Office/Views/PropertyPanel/ViewModular/PageContent.xaml

@@ -15,7 +15,7 @@
     d:DesignHeight="32"
     d:DesignWidth="332"
     prism:ViewModelLocator.AutoWireViewModel="True"
-    Background="#FFFFFF"
+    Background="Transparent"
     mc:Ignorable="d">
 
     <UserControl.Resources>
@@ -30,8 +30,10 @@
             <PathGeometry x:Key="Ic_LastPageButtonPath" Figures="M17.25 6V18H18.75V6H17.25ZM11.0697 15.0697L13.3893 12.75L5 12.75V11.25L13.3893 11.25L11.0697 8.93038L12.1303 7.86972L15.7303 11.4697C16.0232 11.7626 16.0232 12.2375 15.7303 12.5304L12.1303 16.1303L11.0697 15.0697Z" />
         </ResourceDictionary>
     </UserControl.Resources>
-    <StackPanel Name="ParentPanel" Orientation="Horizontal">
-        <StackPanel  Orientation="Horizontal" Margin="16,0,16,0" Width="219" >
+    <Border 
+            CornerRadius="4" Background="{StaticResource color.sys.layout.anti}" Effect="{StaticResource shadow.neutral.m}">
+    <StackPanel Name="ParentPanel" Orientation="Horizontal" >
+        <StackPanel  Orientation="Horizontal" Margin="16,0,16,0" MinWidth="219" >
             <Border
             Width="24"
             Height="24"
@@ -92,14 +94,15 @@
                 </TextBox>
             </Border>
             <TextBlock
+            Margin="8,0,0,0"
             x:Name="TxtPageCount"
             Height="32"
-            MinWidth="42"
+            MinWidth="34"
             Padding="0,5.5,0,0"
             FontFamily="Segoe UI"
             FontSize="14"
             Foreground="#252629"
-            Text="{Binding PageCount, StringFormat=/    {0}}"
+            Text="{Binding PageCount, StringFormat=/ {0}}"
             TextAlignment="Left" />
 
             <Border
@@ -256,6 +259,7 @@
             </Grid>
         </Border>
     </StackPanel>
+    </Border>
     <!--<i:Interaction.Triggers>
     <i:EventTrigger EventName="Loaded">
     <i:InvokeCommandAction Command="{Binding LoadedCommand}" PassEventArgsToCommand="True">

+ 2 - 1
PDF Office/Views/PropertyPanel/ViewModular/ReadViewContent.xaml

@@ -41,10 +41,11 @@
         <!--  阅读模式下的页面控件  -->
         <Border
             Height="44"
-            Margin="0,0,0,5"
+            Margin="0,0,0,16"
             HorizontalAlignment="Center"
             VerticalAlignment="Bottom"
             CornerRadius="4"
+            Background="Transparent"
             MouseEnter="RectangleReadMode_MouseEnter"
             MouseLeave="ReadModeContent_MouseLeave"
             Visibility="{Binding ReadModeContentVisibility}">

+ 1 - 1
PDF Office/Views/ViewContent.xaml

@@ -786,7 +786,7 @@
             x:Name="ReadModeContent"
             Grid.RowSpan="4"
             Height="44"
-            Margin="0,0,0,5"
+            Margin="0,0,0,16"
             HorizontalAlignment="Center"
             VerticalAlignment="Bottom"
             CornerRadius="4"