update to v1.2.1
This commit is contained in:
NaBian committed
1 parent
f9475c318c
commit
be950fac36
75 files changed
+2810
-288
No files matched your search
@@ -13,6 +13,7 @@ namespace HandyControlDemo.UserControl
|
||||
{
|
||||
SimpleIoc.Default.Register<MainContent>();
|
||||
SimpleIoc.Default.Register<LeftMainContent>();
|
||||
SimpleIoc.Default.Register<NoUserContent>();
|
||||
SimpleIoc.Default.Register<GrowlDemoCtl>();
|
||||
SimpleIoc.Default.Register<LoadingDemoCtl>();
|
||||
SimpleIoc.Default.Register<ImageBrowserDemoCtl>();
|
||||
@@ -26,6 +27,7 @@ namespace HandyControlDemo.UserControl
|
||||
SimpleIoc.Default.Register<ToggleButtonDemoCtl>();
|
||||
SimpleIoc.Default.Register<ExpanderDemoCtl>();
|
||||
SimpleIoc.Default.Register<ProgressBarDemoCtl>();
|
||||
SimpleIoc.Default.Register<TabControlDemoCtl>();
|
||||
}
|
||||
|
||||
public static ControlLocator Instance => new Lazy<ControlLocator>(() => new ControlLocator()).Value;
|
||||
@@ -36,6 +38,8 @@ namespace HandyControlDemo.UserControl
|
||||
|
||||
public LeftMainContent LeftMainContent => ServiceLocator.Current.GetInstance<LeftMainContent>();
|
||||
|
||||
public NoUserContent NoUserContent => ServiceLocator.Current.GetInstance<NoUserContent>();
|
||||
|
||||
#endregion
|
||||
|
||||
#region Controls
|
||||
@@ -70,6 +74,8 @@ namespace HandyControlDemo.UserControl
|
||||
|
||||
public ProgressBarDemoCtl ProgressBarDemoCtl => new ProgressBarDemoCtl();
|
||||
|
||||
public TabControlDemoCtl TabControlDemoCtl => new TabControlDemoCtl();
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,8 @@
|
||||
var singleList = new List<string>
|
||||
{
|
||||
"MainContent",
|
||||
"LeftMainContent"
|
||||
"LeftMainContent",
|
||||
"NoUserContent"
|
||||
};
|
||||
var controlList = new List<string>
|
||||
{
|
||||
@@ -24,7 +25,8 @@ var styleList = new List<string>
|
||||
"ButtonDemoCtl",
|
||||
"ToggleButtonDemoCtl",
|
||||
"ExpanderDemoCtl",
|
||||
"ProgressBarDemoCtl"
|
||||
"ProgressBarDemoCtl",
|
||||
"TabControlDemoCtl"
|
||||
};
|
||||
#>
|
||||
using System;
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
Background="White">
|
||||
<controls:TransitioningContentControl>
|
||||
<WrapPanel Margin="32">
|
||||
<Button Command="{Binding InfoCmd}" Content="Info" Margin="0,5,5,5" Style="{StaticResource ButtonPrimary}"></Button>
|
||||
<Button Command="{Binding InfoCmd}" Content="Info" Margin="0,5,5,5" Style="{StaticResource ButtonInfo}"></Button>
|
||||
<Button Command="{Binding SuccessCmd}" Content="Success" Margin="5" Style="{StaticResource ButtonSuccess}"></Button>
|
||||
<Button Command="{Binding WarningCmd}" Content="Warning" Margin="5" Style="{StaticResource ButtonWarning}"></Button>
|
||||
<Button Command="{Binding ErrorCmd}" Content="Error" Margin="5" Style="{StaticResource ButtonDanger}"></Button>
|
||||
<Button Command="{Binding AskCmd}" Content="Ask" Margin="5" Background="BlueViolet" Foreground="White"></Button>
|
||||
<Button Command="{Binding FatalCmd}" Content="Fatal" Margin="5,0"></Button>
|
||||
<Button Command="{Binding ClearCmd}" Content="Clear" Margin="5,0,0,0"></Button>
|
||||
<Button Command="{Binding ClearCmd}" Content="Clear" Margin="5,0,0,0" Style="{StaticResource ButtonPrimary}"></Button>
|
||||
</WrapPanel>
|
||||
</controls:TransitioningContentControl>
|
||||
</UserControl>
|
||||
@@ -2,9 +2,10 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
Background="White"
|
||||
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
|
||||
DataContext="{Binding ImageBrowserDemo,Source={StaticResource Locator}}"
|
||||
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
|
||||
<controls:TransitioningContentControl>
|
||||
<Button Command="{Binding OpenImgCmd}" Content="{StaticResource OpenImageBrowser}" Style="{StaticResource ButtonPrimary}" Margin="32"></Button>
|
||||
<Button Command="{Binding OpenImgCmd}" Content="{x:Static langs:Lang.OpenImageBrowser}" Style="{StaticResource ButtonPrimary}" Margin="32"></Button>
|
||||
</controls:TransitioningContentControl>
|
||||
</UserControl>
|
||||
@@ -0,0 +1,65 @@
|
||||
<UserControl x:Class="HandyControlDemo.UserControl.TabControlDemoCtl"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
Background="White"
|
||||
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
|
||||
<controls:TransitioningContentControl>
|
||||
<controls:ScrollViewer HorizontalScrollBarVisibility="Auto">
|
||||
<StackPanel>
|
||||
<Label Style="{StaticResource LabelInfo}" Content="Default" Margin="32,32,0,0"/>
|
||||
<controls:TabControl Margin="32,16,32,0" Width="800" Height="300">
|
||||
<controls:TabItem Header="TabItem1">
|
||||
<Grid Background="White"/>
|
||||
</controls:TabItem>
|
||||
<controls:TabItem Header="TabItem2">
|
||||
<Grid Background="{StaticResource DarkDangerBrush}"/>
|
||||
</controls:TabItem>
|
||||
<controls:TabItem Header="TabItem3" IsSelected="True">
|
||||
<Grid Background="{StaticResource PrimaryBrush}"/>
|
||||
</controls:TabItem>
|
||||
<controls:TabItem Header="TabItem4">
|
||||
<Grid Background="{StaticResource DarkInfoBrush}"/>
|
||||
</controls:TabItem>
|
||||
<controls:TabItem Header="TabItem5">
|
||||
<Grid Background="{StaticResource DarkSuccessBrush}"/>
|
||||
</controls:TabItem>
|
||||
<controls:TabItem Header="TabItem6">
|
||||
<Grid Background="{StaticResource DarkWarningBrush}"/>
|
||||
</controls:TabItem>
|
||||
<controls:TabItem Header="TabItem7">
|
||||
<Grid Background="{StaticResource DarkAccentBrush}"/>
|
||||
</controls:TabItem>
|
||||
</controls:TabControl>
|
||||
<StackPanel Orientation="Horizontal" Margin="32,32,32,16">
|
||||
<Label Style="{StaticResource LabelInfo}" Margin="0" Content="IsEnableTabFill = True"/>
|
||||
<Label Style="{StaticResource LabelInfo}" Margin="16,0,0,0" Content="ShowCloseButton = True"/>
|
||||
<Label Style="{StaticResource LabelInfo}" Margin="16,0,0,0" Content="IsDraggable = True"/>
|
||||
<Label Style="{StaticResource LabelInfo}" Margin="16,0,0,0" Content="IsEnableAnimation = True"/>
|
||||
</StackPanel>
|
||||
<controls:TabControl IsEnableAnimation="True" ShowCloseButton="True" IsDraggable="True" IsEnableTabFill="True" Margin="32,0,32,32" Width="800" Height="300">
|
||||
<controls:TabItem Header="TabItem1">
|
||||
<Grid Background="White"/>
|
||||
</controls:TabItem>
|
||||
<controls:TabItem IsSelected="True" Header="TabItem2">
|
||||
<Grid Background="#FFE8563F"/>
|
||||
</controls:TabItem>
|
||||
<controls:TabItem Header="TabItem3">
|
||||
<Grid Background="#FF3F4EE8"/>
|
||||
</controls:TabItem>
|
||||
<controls:TabItem Header="TabItem4">
|
||||
<Grid Background="#FFE83F6D"/>
|
||||
</controls:TabItem>
|
||||
<controls:TabItem Header="TabItem5">
|
||||
<Grid Background="#FFB23FE8"/>
|
||||
</controls:TabItem>
|
||||
<controls:TabItem Header="TabItem6">
|
||||
<Grid Background="#FF3FE8E8"/>
|
||||
</controls:TabItem>
|
||||
<controls:TabItem Header="TabItem7">
|
||||
<Grid Background="#FFE8E03F"/>
|
||||
</controls:TabItem>
|
||||
</controls:TabControl>
|
||||
</StackPanel>
|
||||
</controls:ScrollViewer>
|
||||
</controls:TransitioningContentControl>
|
||||
</UserControl>
|
||||
@@ -0,0 +1,14 @@
|
||||
// ReSharper disable once CheckNamespace
|
||||
namespace HandyControlDemo.UserControl
|
||||
{
|
||||
/// <summary>
|
||||
/// TabControlDemoCtl.xaml 的交互逻辑
|
||||
/// </summary>
|
||||
public partial class TabControlDemoCtl
|
||||
{
|
||||
public TabControlDemoCtl()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:data="clr-namespace:HandyControlDemo.Data"
|
||||
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
|
||||
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||
<TreeView controls:ScrollViewer.IsEnableInertia="True" BorderThickness="0">
|
||||
<i:Interaction.Triggers>
|
||||
@@ -12,22 +13,23 @@
|
||||
<command:EventToCommand Command="{Binding SwitchDemoCmd}" PassEventArgsToCommand="True" />
|
||||
</i:EventTrigger>
|
||||
</i:Interaction.Triggers>
|
||||
<TreeViewItem IsExpanded="True" Header="{StaticResource Styles}">
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadButtonDemoCtl}" Header="{StaticResource Button}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadToggleButtonDemoCtl}" Header="{StaticResource ToggleButton}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadExpanderDemoCtl}" Header="{StaticResource Expander}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadProgressBarDemoCtl}" Header="{StaticResource ProgressBar}"/>
|
||||
<TreeViewItem IsExpanded="True" Header="{x:Static langs:Lang.Styles}">
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadButtonDemoCtl}" Header="{x:Static langs:Lang.Button}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadToggleButtonDemoCtl}" Header="{x:Static langs:Lang.ToggleButton}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadExpanderDemoCtl}" Header="{x:Static langs:Lang.Expander}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadProgressBarDemoCtl}" Header="{x:Static langs:Lang.ProgressBar}"/>
|
||||
</TreeViewItem>
|
||||
<TreeViewItem IsExpanded="True" Header="{StaticResource Controls}">
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadGrowlDemoCtl}" Header="{StaticResource Growl}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadLoadingDemoCtl}" Header="{StaticResource Loading}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadImageBrowserDemoCtl}" Header="{StaticResource ImageBrowser}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadColorPickerDemoCtl}" Header="{StaticResource ColorPicker}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadCarouselDemoCtl}" Header="{StaticResource Carousel}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadCompareSliderDemoCtl}" Header="{StaticResource CompareSlider}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadTimeBarDemoCtl}" Header="{StaticResource TimeBar}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadPaginationDemoCtl}" Header="{StaticResource Pagination}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadAnimationPathDemoCtl}" Header="{StaticResource AnimationPath}"/>
|
||||
<TreeViewItem IsExpanded="True" Header="{x:Static langs:Lang.Controls}">
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadGrowlDemoCtl}" Header="{x:Static langs:Lang.Growl}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadLoadingDemoCtl}" Header="{x:Static langs:Lang.Loading}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadImageBrowserDemoCtl}" Header="{x:Static langs:Lang.ImageBrowser}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadColorPickerDemoCtl}" Header="{x:Static langs:Lang.ColorPicker}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadCarouselDemoCtl}" Header="{x:Static langs:Lang.Carousel}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadCompareSliderDemoCtl}" Header="{x:Static langs:Lang.CompareSlider}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadTimeBarDemoCtl}" Header="{x:Static langs:Lang.TimeBar}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadPaginationDemoCtl}" Header="{x:Static langs:Lang.Pagination}"/>
|
||||
<TreeViewItem Tag="{x:Static data:MessageToken.LoadAnimationPathDemoCtl}" Header="{x:Static langs:Lang.AnimationPath}"/>
|
||||
<TreeViewItem Style="{StaticResource TreeViewItemNew}" Tag="{x:Static data:MessageToken.LoadTabControlDemoCtl}" Header="{x:Static langs:Lang.TabControl}"/>
|
||||
</TreeViewItem>
|
||||
</TreeView>
|
||||
</Border>
|
||||
@@ -3,13 +3,13 @@
|
||||
x:Class="HandyControlDemo.UserControl.MainContent"
|
||||
Background="#f0f0f0">
|
||||
<Border Background="{StaticResource MainContentBackground}">
|
||||
<Grid Name="GridMain" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="16,0,16,16">
|
||||
<Grid Name="GridMain" MinHeight="300" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="16">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition/>
|
||||
</Grid.RowDefinitions>
|
||||
<Border Name="BorderEffect" Grid.RowSpan="2" Background="White" CornerRadius="0,0,10,10" Effect="{StaticResource EffectShadow4}"></Border>
|
||||
<Border Height="32" Name="BorderTitle" Grid.Row="0" Background="{StaticResource PrimaryBrush}">
|
||||
<Border Name="BorderEffect" Grid.RowSpan="2" Background="White" CornerRadius="10" Effect="{StaticResource EffectShadow4}"></Border>
|
||||
<Border Height="32" Name="BorderTitle" Grid.Row="0" CornerRadius="10,10,0,0" Background="{StaticResource PrimaryBrush}">
|
||||
<TextBlock Style="{StaticResource TextBlockDefault}" Foreground="White" Text="{Binding ContentTitle}"></TextBlock>
|
||||
</Border>
|
||||
<Border Grid.Row="1" ClipToBounds="True">
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
<StackPanel x:Class="HandyControlDemo.UserControl.NoUserContent"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:interactivity="clr-namespace:HandyControl.Interactivity;assembly=HandyControl"
|
||||
Orientation="Horizontal">
|
||||
<Button WindowChrome.IsHitTestVisibleInChrome="True" Width="28" Height="28" Style="{StaticResource ButtonOpacityStyle}">
|
||||
<interactivity:Interaction.Triggers>
|
||||
<interactivity:EventTrigger EventName="Click">
|
||||
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.ShowSystemMenuCommand}" />
|
||||
</interactivity:EventTrigger>
|
||||
<interactivity:EventTrigger EventName="MouseDoubleClick">
|
||||
<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
|
||||
</interactivity:EventTrigger>
|
||||
</interactivity:Interaction.Triggers>
|
||||
<Path Height="16" Fill="White" Stretch="Uniform" Data="{StaticResource LogoGeometry}"/>
|
||||
</Button>
|
||||
<Menu Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Background="Transparent">
|
||||
<MenuItem Foreground="White" Header="File">
|
||||
<MenuItem Header="New repository" InputGestureText="Ctrl+N"></MenuItem>
|
||||
<Separator></Separator>
|
||||
<MenuItem Header="Add local repository"></MenuItem>
|
||||
<MenuItem Header="Clone repository"></MenuItem>
|
||||
</MenuItem>
|
||||
<MenuItem Foreground="White" Header="Edit"></MenuItem>
|
||||
<MenuItem Foreground="White" Header="View"></MenuItem>
|
||||
<MenuItem Foreground="White" Header="Repository"></MenuItem>
|
||||
<MenuItem Foreground="White" Header="Branch"></MenuItem>
|
||||
<MenuItem Foreground="White" Header="Help"></MenuItem>
|
||||
</Menu>
|
||||
</StackPanel>
|
||||
@@ -0,0 +1,14 @@
|
||||
// ReSharper disable once CheckNamespace
|
||||
namespace HandyControlDemo.UserControl
|
||||
{
|
||||
/// <summary>
|
||||
/// NoUserContent.xaml 的交互逻辑
|
||||
/// </summary>
|
||||
public partial class NoUserContent
|
||||
{
|
||||
public NoUserContent()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,38 +2,39 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
|
||||
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
|
||||
Background="White">
|
||||
<controls:TransitioningContentControl>
|
||||
<controls:ScrollViewer IsEnableInertia="True">
|
||||
<StackPanel Margin="32">
|
||||
<WrapPanel ItemWidth="160" ItemHeight="130">
|
||||
<StackPanel>
|
||||
<Button Content="默认" Margin="5"></Button>
|
||||
<Button IsEnabled="False" Content="默认" Margin="5"></Button>
|
||||
<Button Content="{x:Static langs:Lang.Default}" Margin="5"></Button>
|
||||
<Button IsEnabled="False" Content="{x:Static langs:Lang.Default}" Margin="5"></Button>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<Button Content="主要" Margin="5" Style="{StaticResource ButtonPrimary}"></Button>
|
||||
<Button IsEnabled="False" Content="主要" Margin="5" Style="{StaticResource ButtonPrimary}"></Button>
|
||||
<Button Content="{x:Static langs:Lang.Primary}" Margin="5" Style="{StaticResource ButtonPrimary}"></Button>
|
||||
<Button IsEnabled="False" Content="{x:Static langs:Lang.Primary}" Margin="5" Style="{StaticResource ButtonPrimary}"></Button>
|
||||
<TextBlock Style="{StaticResource TextBlockDefault}" Text="ButtonPrimary"></TextBlock>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<Button Content="成功" Margin="5" Style="{StaticResource ButtonSuccess}"></Button>
|
||||
<Button IsEnabled="False" Content="成功" Margin="5" Style="{StaticResource ButtonSuccess}"></Button>
|
||||
<Button Content="{x:Static langs:Lang.Success}" Margin="5" Style="{StaticResource ButtonSuccess}"></Button>
|
||||
<Button IsEnabled="False" Content="{x:Static langs:Lang.Success}" Margin="5" Style="{StaticResource ButtonSuccess}"></Button>
|
||||
<TextBlock Style="{StaticResource TextBlockDefault}" Text="ButtonSuccess"></TextBlock>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<Button Content="信息" Margin="5" Style="{StaticResource ButtonInfo}"></Button>
|
||||
<Button IsEnabled="False" Content="信息" Margin="5" Style="{StaticResource ButtonInfo}"></Button>
|
||||
<Button Content="{x:Static langs:Lang.Info}" Margin="5" Style="{StaticResource ButtonInfo}"></Button>
|
||||
<Button IsEnabled="False" Content="{x:Static langs:Lang.Info}" Margin="5" Style="{StaticResource ButtonInfo}"></Button>
|
||||
<TextBlock Style="{StaticResource TextBlockDefault}" Text="ButtonInfo"></TextBlock>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<Button Content="警告" Margin="5" Style="{StaticResource ButtonWarning}"></Button>
|
||||
<Button IsEnabled="False" Content="警告" Margin="5" Style="{StaticResource ButtonWarning}"></Button>
|
||||
<Button Content="{x:Static langs:Lang.Warning}" Margin="5" Style="{StaticResource ButtonWarning}"></Button>
|
||||
<Button IsEnabled="False" Content="{x:Static langs:Lang.Warning}" Margin="5" Style="{StaticResource ButtonWarning}"></Button>
|
||||
<TextBlock Style="{StaticResource TextBlockDefault}" Text="ButtonWarning"></TextBlock>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<Button Content="危险" Margin="5" Style="{StaticResource ButtonDanger}"></Button>
|
||||
<Button IsEnabled="False" Content="危险" Margin="5" Style="{StaticResource ButtonDanger}"></Button>
|
||||
<Button Content="{x:Static langs:Lang.Danger}" Margin="5" Style="{StaticResource ButtonDanger}"></Button>
|
||||
<Button IsEnabled="False" Content="{x:Static langs:Lang.Danger}" Margin="5" Style="{StaticResource ButtonDanger}"></Button>
|
||||
<TextBlock Style="{StaticResource TextBlockDefault}" Text="ButtonDanger"></TextBlock>
|
||||
</StackPanel>
|
||||
</WrapPanel>
|
||||
@@ -69,7 +70,7 @@
|
||||
<TextBlock TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ButtonIconPrimary（DeleteGeometry）"></TextBlock>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<Button Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="透明按钮" Style="{StaticResource ButtonOpacityStyle}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"></Button>
|
||||
<Button Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="{x:Static langs:Lang.ButtonOpacity}" Style="{StaticResource ButtonOpacityStyle}" controls:BackgroundSwitchElement.MouseHoverBackground="Red" controls:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"></Button>
|
||||
<TextBlock TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ButtonOpacityStyle"></TextBlock>
|
||||
</StackPanel>
|
||||
</WrapPanel>
|
||||
|
||||
@@ -2,19 +2,20 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
Background="White"
|
||||
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
|
||||
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
|
||||
<controls:TransitioningContentControl>
|
||||
<StackPanel Margin="32">
|
||||
<Expander Header="标题1" BorderThickness="1,1,1,0" BorderBrush="{StaticResource BorderBrush}" Width="240" HorizontalAlignment="Left">
|
||||
<Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1,1,1,0" BorderBrush="{StaticResource BorderBrush}" Width="240" HorizontalAlignment="Left">
|
||||
<Border Height="100" Background="{StaticResource BackgroundBrush}"></Border>
|
||||
</Expander>
|
||||
<Expander Header="标题1" BorderThickness="1,1,1,0" BorderBrush="{StaticResource BorderBrush}" Width="240" HorizontalAlignment="Left">
|
||||
<Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1,1,1,0" BorderBrush="{StaticResource BorderBrush}" Width="240" HorizontalAlignment="Left">
|
||||
<Border Height="100" Background="{StaticResource BackgroundBrush}"></Border>
|
||||
</Expander>
|
||||
<Expander Header="标题1" BorderThickness="1,1,1,0" BorderBrush="{StaticResource BorderBrush}" Width="240" HorizontalAlignment="Left">
|
||||
<Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1,1,1,0" BorderBrush="{StaticResource BorderBrush}" Width="240" HorizontalAlignment="Left">
|
||||
<Border Height="100" Background="{StaticResource BackgroundBrush}"></Border>
|
||||
</Expander>
|
||||
<Expander Header="标题1" BorderThickness="1" BorderBrush="{StaticResource BorderBrush}" Width="240" HorizontalAlignment="Left">
|
||||
<Expander Header="{x:Static langs:Lang.Title}" BorderThickness="1" BorderBrush="{StaticResource BorderBrush}" Width="240" HorizontalAlignment="Left">
|
||||
<Border Height="100" Background="{StaticResource BackgroundBrush}"></Border>
|
||||
</Expander>
|
||||
</StackPanel>
|
||||
|
||||
@@ -2,37 +2,38 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
Background="White"
|
||||
xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
|
||||
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl">
|
||||
<controls:TransitioningContentControl>
|
||||
<controls:ScrollViewer IsEnableInertia="True">
|
||||
<WrapPanel Margin="32" ItemWidth="160" ItemHeight="130">
|
||||
<StackPanel>
|
||||
<ToggleButton IsChecked="True" Content="默认" Margin="5"></ToggleButton>
|
||||
<ToggleButton IsEnabled="False" Content="默认" Margin="5"></ToggleButton>
|
||||
<ToggleButton IsChecked="True" Content="{x:Static langs:Lang.Default}" Margin="5"></ToggleButton>
|
||||
<ToggleButton IsEnabled="False" Content="{x:Static langs:Lang.Default}" Margin="5"></ToggleButton>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<ToggleButton IsChecked="True" Content="主要" Margin="5" Style="{StaticResource ToggleButtonPrimary}"></ToggleButton>
|
||||
<ToggleButton IsEnabled="False" Content="主要" Margin="5" Style="{StaticResource ToggleButtonPrimary}"></ToggleButton>
|
||||
<ToggleButton IsChecked="True" Content="{x:Static langs:Lang.Primary}" Margin="5" Style="{StaticResource ToggleButtonPrimary}"></ToggleButton>
|
||||
<ToggleButton IsEnabled="False" Content="{x:Static langs:Lang.Primary}" Margin="5" Style="{StaticResource ToggleButtonPrimary}"></ToggleButton>
|
||||
<TextBlock Style="{StaticResource TextBlockDefault}" Text="ToggleButtonPrimary"></TextBlock>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<ToggleButton IsChecked="True" Content="成功" Margin="5" Style="{StaticResource ToggleButtonSuccess}"></ToggleButton>
|
||||
<ToggleButton IsEnabled="False" Content="成功" Margin="5" Style="{StaticResource ToggleButtonSuccess}"></ToggleButton>
|
||||
<ToggleButton IsChecked="True" Content="{x:Static langs:Lang.Success}" Margin="5" Style="{StaticResource ToggleButtonSuccess}"></ToggleButton>
|
||||
<ToggleButton IsEnabled="False" Content="{x:Static langs:Lang.Success}" Margin="5" Style="{StaticResource ToggleButtonSuccess}"></ToggleButton>
|
||||
<TextBlock Style="{StaticResource TextBlockDefault}" Text="ToggleButtonSuccess"></TextBlock>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<ToggleButton Content="信息" Margin="5" Style="{StaticResource ToggleButtonInfo}"></ToggleButton>
|
||||
<ToggleButton IsEnabled="False" Content="信息" Margin="5" Style="{StaticResource ToggleButtonInfo}"></ToggleButton>
|
||||
<ToggleButton Content="{x:Static langs:Lang.Info}" Margin="5" Style="{StaticResource ToggleButtonInfo}"></ToggleButton>
|
||||
<ToggleButton IsEnabled="False" Content="{x:Static langs:Lang.Info}" Margin="5" Style="{StaticResource ToggleButtonInfo}"></ToggleButton>
|
||||
<TextBlock Style="{StaticResource TextBlockDefault}" Text="ToggleButtonInfo"></TextBlock>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<ToggleButton Content="警告" Margin="5" Style="{StaticResource ToggleButtonWarning}"></ToggleButton>
|
||||
<ToggleButton IsEnabled="False" Content="警告" Margin="5" Style="{StaticResource ToggleButtonWarning}"></ToggleButton>
|
||||
<ToggleButton Content="{x:Static langs:Lang.Warning}" Margin="5" Style="{StaticResource ToggleButtonWarning}"></ToggleButton>
|
||||
<ToggleButton IsEnabled="False" Content="{x:Static langs:Lang.Warning}" Margin="5" Style="{StaticResource ToggleButtonWarning}"></ToggleButton>
|
||||
<TextBlock Style="{StaticResource TextBlockDefault}" Text="ToggleButtonWarning"></TextBlock>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
<ToggleButton Content="危险" Margin="5" Style="{StaticResource ToggleButtonDanger}"></ToggleButton>
|
||||
<ToggleButton IsEnabled="False" Content="危险" Margin="5" Style="{StaticResource ToggleButtonDanger}"></ToggleButton>
|
||||
<ToggleButton Content="{x:Static langs:Lang.Danger}" Margin="5" Style="{StaticResource ToggleButtonDanger}"></ToggleButton>
|
||||
<ToggleButton IsEnabled="False" Content="{x:Static langs:Lang.Danger}" Margin="5" Style="{StaticResource ToggleButtonDanger}"></ToggleButton>
|
||||
<TextBlock Style="{StaticResource TextBlockDefault}" Text="ToggleButtonDanger"></TextBlock>
|
||||
</StackPanel>
|
||||
<StackPanel>
|
||||
|
||||
Reference in new issue
Block a user