Merge branch 'perfectUI' into PR-932

ywmoyue · Dec 14, 2024 · 33d673a · 33d673a
2 parents a349ce3 + 30c300e
commit 33d673a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/BiliLite.UWP/Controls/Settings/UISettingsControl.xaml b/src/BiliLite.UWP/Controls/Settings/UISettingsControl.xaml
@@ -334,7 +334,7 @@
                                        Description="是否固定标签页宽度（下次打开应用生效）">
                     <StackPanel Orientation="Horizontal">
                         <ToggleSwitch x:Name="SwitchTabItemFixedWidth" ></ToggleSwitch>
-                        <controls1:NumberBox x:Name="NumTabItemFixedWidth" Minimum="100" MinWidth="200" IsEnabled="{Binding IsOn, ElementName=SwitchTabItemFixedWidth}" Margin="30 5 0 5"></controls1:NumberBox>
+                        <controls1:NumberBox x:Name="NumTabItemFixedWidth" Minimum="200" MinWidth="200" IsEnabled="{Binding IsOn, ElementName=SwitchTabItemFixedWidth}" Margin="30 5 0 5"></controls1:NumberBox>
                     </StackPanel>
                 </controls:SettingsCard>
             </controls:SettingsExpander.Items>

diff --git a/src/BiliLite.UWP/MainPage.xaml b/src/BiliLite.UWP/MainPage.xaml
@@ -61,7 +61,7 @@
             Visibility="Collapsed" />
         <Grid
             x:Name="gridViewer"
-            Margin="0,48,0,0"
+            Margin="0,40,0,0"
             Background="{ThemeResource SystemControlChromeHighAcrylicElementMediumBrush}"
             Opacity="0"
             Visibility="Collapsed">

diff --git a/src/BiliLite.UWP/Styles/TabViewStyle.xaml b/src/BiliLite.UWP/Styles/TabViewStyle.xaml
@@ -68,7 +68,7 @@
 
                             <Border
                                 Grid.Column="2"
-                                Padding="15,8"
+                                Padding="5,8"
                                 VerticalAlignment="Center"
                                 Background="{ThemeResource TabViewRightContentPresenterColor}"
                                 Visibility="{Binding IsAddTabButtonVisible, RelativeSource={RelativeSource TemplatedParent}}">
@@ -183,7 +183,6 @@
                         <Grid
                             x:Name="TabContainer"
                             Grid.Column="1"
-                            Margin="0,-4,0,-6"
                             Padding="15,0"
                             Background="{ThemeResource TabViewRightContentPresenterColor}"
                             BorderBrush="{TemplateBinding BorderBrush}"
@@ -234,7 +233,7 @@
                             <Button
                                 x:Name="CloseButton"
                                 Grid.Column="2"
-                                Margin="{ThemeResource TabViewItemHeaderCloseMargin}"
+                                Margin="0,0,-8,0"
                                 Content="&#xE711;"
                                 HighContrastAdjustment="None"
                                 IsTabStop="False"