Skip to content

T
Thick-Common
Commit b2c7eba0 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

缩小了 NoToggleButtonStyle.xaml 与 ToggleButtonOnOffStyle.xaml 控件尺寸

parent 94085f03
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/NoToggleButtonStyle.xaml
View file @ b2c7eba0
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<Setter Property="HorizontalContentAlignment" Value="Center"/> <Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/> <Setter Property="Padding" Value="1"/>
<Setter Property="Width" Value="110"/> <Setter Property="Width" Value="82"/>
<Setter Property="OffBrush" Value="{StaticResource Color_theme_static}" /> <Setter Property="OffBrush" Value="{StaticResource Color_theme_static}" />
<Setter Property="OnBrush" Value="{StaticResource Color_theme_activity}" /> <Setter Property="OnBrush" Value="{StaticResource Color_theme_activity}" />
<Setter Property="OffLabel" Value="{Binding Content,RelativeSource={RelativeSource Mode=Self}}" /> <Setter Property="OffLabel" Value="{Binding Content,RelativeSource={RelativeSource Mode=Self}}" />
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="flyctrl:NoToggleButton"> <ControlTemplate TargetType="flyctrl:NoToggleButton">
<Border x:Name="canvas" Height="55" Width="{TemplateBinding Width}" Background="{TemplateBinding OffBrush}"> <Border x:Name="canvas" Width="{TemplateBinding Width}" Background="{TemplateBinding OffBrush}">
<Grid> <Grid>
<Rectangle x:Name="Path_block" Height="45" Width="24" Margin="5" Fill="White" HorizontalAlignment="Left"/> <Rectangle x:Name="Path_block" Height="33" Width="18" Margin="5" Fill="White" HorizontalAlignment="Left"/>
<StackPanel x:Name="SP_Text" Orientation="Horizontal" Margin="20,15" HorizontalAlignment="Right"> <StackPanel x:Name="SP_Text" Orientation="Horizontal" Margin="15,0" HorizontalAlignment="Right" VerticalAlignment="Center">
<TextBlock x:Name="TB_OnOff" Text="{TemplateBinding Property=OffLabel}" Foreground="White" FontSize="24" FontFamily="Microsoft Sans Serif"/> <TextBlock x:Name="TB_OnOff" Text="{TemplateBinding Property=OffLabel}" Foreground="White" FontSize="18" FontFamily="Global Sans Serif"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>
......
Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/ToggleButtonOnOffStyle.xaml
View file @ b2c7eba0
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<Setter Property="HorizontalContentAlignment" Value="Center"/> <Setter Property="HorizontalContentAlignment" Value="Center"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="1"/> <Setter Property="Padding" Value="1"/>
<Setter Property="Width" Value="110"/> <Setter Property="Width" Value="82"/>
<Setter Property="OffBrush" Value="{StaticResource Color_theme_static}" /> <Setter Property="OffBrush" Value="{StaticResource Color_theme_static}" />
<Setter Property="OnBrush" Value="{StaticResource Color_theme_activity}" /> <Setter Property="OnBrush" Value="{StaticResource Color_theme_activity}" />
<Setter Property="OffLabel" Value="{Binding Content,RelativeSource={RelativeSource Mode=Self}}" /> <Setter Property="OffLabel" Value="{Binding Content,RelativeSource={RelativeSource Mode=Self}}" />
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="flyctrl:ToggleButtonOnOff"> <ControlTemplate TargetType="flyctrl:ToggleButtonOnOff">
<Border x:Name="canvas" Height="55" Width="{TemplateBinding Width}" Background="{TemplateBinding OffBrush}"> <Border x:Name="canvas" Width="{TemplateBinding Width}" Background="{TemplateBinding OffBrush}">
<Grid> <Grid>
<Rectangle x:Name="Path_block" Height="45" Width="24" Margin="5" Fill="White" HorizontalAlignment="Left"/> <Rectangle x:Name="Path_block" Height="33" Width="18" Margin="5" Fill="White" HorizontalAlignment="Left"/>
<StackPanel x:Name="SP_Text" Orientation="Horizontal" Margin="20,15" HorizontalAlignment="Right"> <StackPanel x:Name="SP_Text" Orientation="Horizontal" Margin="15,0" HorizontalAlignment="Right" VerticalAlignment="Center">
<TextBlock x:Name="TB_OnOff" Text="{TemplateBinding Property=OffLabel}" Foreground="White" FontSize="24" FontFamily="Microsoft Sans Serif"/> <TextBlock x:Name="TB_OnOff" Text="{TemplateBinding Property=OffLabel}" Foreground="White" FontSize="18" FontFamily="Global Sans Serif"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Border> </Border>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment