Bladeren bron

样式更新

Shun 2 jaren geleden
bovenliggende
commit
f7785bbf52

+ 2 - 2
src/YSAI.Controls/hamburgermenu/HamburgerMenu.xaml

@@ -40,7 +40,7 @@
                                             <DoubleAnimation
                                          Storyboard.TargetProperty="Width"
                                          To="240"
-                                         Duration="0:0:0.2" />
+                                         Duration="0:0:0.1" />
                                         </Storyboard>
                                     </BeginStoryboard>
                                 </Trigger.EnterActions>
@@ -50,7 +50,7 @@
                                             <DoubleAnimation
                                          Storyboard.TargetProperty="Width"
                                          To="50"
-                                         Duration="0:0:0.2" />
+                                         Duration="0:0:0.1" />
                                         </Storyboard>
                                     </BeginStoryboard>
                                 </Trigger.ExitActions>

+ 3 - 1
src/YSAI.Resources/style/Style_TbaControl.xaml

@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:controls="clr-namespace:YSAI.Resources.style">
     <Style x:Key="TabItemLineStyle" TargetType="{x:Type TabItem}">
         <Setter Property="FocusVisualStyle"
                     Value="{x:Null}" />
@@ -274,4 +275,5 @@
             </Setter.Value>
         </Setter>
     </Style>
+
 </ResourceDictionary>

+ 2 - 4
src/YSAI.Tool/MainWindow.xaml

@@ -39,7 +39,7 @@
             </hm:HamburgerMenu>
         </Border>
         <Grid Grid.Column="1">
-            <TabControl ItemsSource="{Binding TabControlItemsSource}"  TabStripPlacement="Top" SelectedItem="{Binding TabControlSelectedItem}">
+            <TabControl ItemsSource="{Binding TabControlItemsSource}"  TabStripPlacement="Left" SelectedItem="{Binding TabControlSelectedItem}">
                 <TabControl.Resources>
                     <!-- 笔刷用于定义TabControl和TabItem的外观-->
 
@@ -56,6 +56,7 @@
                     <SolidColorBrush x:Key="TabItemNormalBackground" Color="WhiteSmoke"/>
                     <SolidColorBrush x:Key="TabItemHoverBackground" Color="LightGray"/>
                     <SolidColorBrush x:Key="TabItemSelectedBackground" Color="LightGray"/>
+                    
 
                     <!--关闭按钮的样式-->
                     <Style x:Key="CloseButtonStyle" TargetType="{x:Type Button}">
@@ -145,14 +146,11 @@
                     </Style>
                     <!--tab控件样式-->
                     <Style TargetType="{x:Type TabControl}">
-                        <Setter Property="KeyboardNavigation.TabNavigation" Value="Cycle"/>
-                        <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="Cycle"/>
                         <Setter Property="HorizontalContentAlignment" Value="Center" />
                         <Setter Property="VerticalContentAlignment" Value="Center" />
                         <Setter Property="SnapsToDevicePixels" Value="True"/>
                         <Setter Property="Background" Value="Transparent"/>
                         <Setter Property="BorderBrush" Value="Transparent"/>
-                        <Setter Property="Margin" Value="0,10,0,0"/>
                     </Style>
                 </TabControl.Resources>
                 <TabControl.ContentTemplate>