Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UWP like ToggleSwitch #3756

Merged
merged 12 commits into from Mar 1, 2020
Merged

UWP like ToggleSwitch #3756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
923e3af
(GH-3753) Simplify ToggleSwitch samples
punker76 Feb 26, 2020
4c38c69
(GH-3753) Remove old ToggleSwitch and ToggleSwitchButton and replace …
punker76 Feb 28, 2020
adc9644
(GH-3753) Fix focusing control on MouseLeftButtonDown event
punker76 Feb 28, 2020
3247d29
(GH-3753) Codacy/PR Quality Review: toggle only when necessary
punker76 Feb 28, 2020
d0d9f96
(GH-3753) Add missing on/off animations
punker76 Feb 29, 2020
a7bc047
(GH-3753) Use ToggleSwitchContentSpaceMargin for space between switch…
punker76 Feb 29, 2020
214ce60
XamlStyler
punker76 Feb 29, 2020
178a288
(GH-3753) Add ToggleSwitchAutomationPeer
punker76 Feb 29, 2020
bd82726
(GH-3753) Use HeaderedControlHelper.HeaderFontFamily attached property
punker76 Feb 29, 2020
cd67bc3
(GH-3753) Add a Command property which will be executed when the IsOn…
punker76 Mar 1, 2020
44791a3
(GH-3753) Remove RectangleHeightToRadiusConverter
punker76 Mar 1, 2020
b4df0cc
(GH-3753) Minor sample update
punker76 Mar 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
83 changes: 18 additions & 65 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
View file
Open in desktop
Expand Up @@ -273,78 +273,28 @@
</StackPanel>
</StackPanel>

<StackPanel Grid.Row="1"
Grid.Column="0"
HorizontalAlignment="Center">
<StackPanel.Resources>
<Style x:Key="CustomMetroToggleSwitch"
BasedOn="{StaticResource MahApps.Styles.ToggleSwitch}"
TargetType="{x:Type Controls:ToggleSwitch}">
<Setter Property="OffLabel" Value="False" />
<Setter Property="OffSwitchBrush" Value="Red" />
<Setter Property="OnLabel" Value="True" />
<Setter Property="OnSwitchBrush" Value="Green" />
</Style>
<Style x:Key="CustomMetroToggleSwitchButton"
BasedOn="{StaticResource MahApps.Styles.ToggleSwitchButton}"
TargetType="{x:Type Controls:ToggleSwitchButton}">
<Setter Property="OffSwitchBrush" Value="DarkRed" />
<Setter Property="OnSwitchBrush" Value="DarkGreen" />
</Style>
</StackPanel.Resources>
<Label Content="Toggle switch" Style="{DynamicResource DescriptionHeaderStyle}" />
<Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
Header="ToggleSwitch Header"
IsChecked="True"
ToggleSwitchButtonStyle="{StaticResource CustomMetroToggleSwitchButton}" />
<Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
IsChecked="True"
Style="{DynamicResource CustomMetroToggleSwitch}" />
<Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
IsChecked="True"
IsEnabled="False" />
<Controls:ToggleSwitch Margin="{StaticResource ControlMargin}" IsEnabled="False" />
</StackPanel>
<!-- Row 1 -->

<StackPanel Grid.Row="1"
Grid.Column="1"
Grid.Column="0"
HorizontalAlignment="Center">
<StackPanel.Resources>
<BooleanToVisibilityConverter x:Key="btv" />
</StackPanel.Resources>
<Label Content="Enable / Visible" Style="{DynamicResource DescriptionHeaderStyle}" />
<Controls:ToggleSwitch x:Name="enabledSwitch"
Margin="{StaticResource ControlMargin}"
Header="Win10 Style"
IsChecked="True"
OffLabel="Disabled"
OnLabel="Enabled"
Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" />
<Controls:ToggleSwitch x:Name="visibleSwitch"
Margin="{StaticResource ControlMargin}"
Controls:ValidationHelper.CloseOnMouseLeftButtonDown="True"
Controls:ValidationHelper.ShowValidationErrorOnMouseOver="True"
IsChecked="{Binding IsToggleSwitchVisible, ValidatesOnDataErrors=True}"
OffLabel="Collapsed"
OnLabel="Visible"
Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" />
<Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
IsEnabled="{Binding ElementName=enabledSwitch, Path=IsChecked}"
Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}"
Visibility="{Binding ElementName=visibleSwitch, Path=IsChecked, Converter={StaticResource btv}}" />
<Label Content="ToggleSwitch" Style="{DynamicResource DescriptionHeaderStyle}" />

<Controls:ToggleSwitch x:Name="TestToggleSwitch" Margin="{StaticResource ControlMargin}" Header="Header" />
<Controls:ToggleSwitch Margin="{StaticResource ControlMargin}" IsEnabled="{Binding ElementName=TestToggleSwitch, Path=IsOn, Mode=OneWay}" />
<Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
IsChecked="True"
IsEnabled="False"
Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" />
IsOn="True"
OffContent="Disabled"
OnContent="Enabled" />
<Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
IsChecked="False"
IsEnabled="False"
Style="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" />
IsOn="True"
OffContent="Disabled"
OnContent="Enabled" />
</StackPanel>

<StackPanel Grid.Row="1"
Grid.Column="2"
Grid.Column="1"
HorizontalAlignment="Center"
UseLayoutRounding="True">
<StackPanel>
Expand Down Expand Up @@ -395,7 +345,7 @@
</StackPanel>

<StackPanel Grid.Row="1"
Grid.Column="3"
Grid.Column="2"
HorizontalAlignment="Center"
UseLayoutRounding="True">
<StackPanel>
Expand Down Expand Up @@ -458,7 +408,7 @@
</StackPanel>

<StackPanel Grid.Row="1"
Grid.Column="4"
Grid.Column="3"
HorizontalAlignment="Stretch">
<StackPanel.Resources>
<Style x:Key="CircleDropDownButton"
Expand Down Expand Up @@ -523,7 +473,11 @@
</Controls:DropDownButton.Icon>
</Controls:DropDownButton>
</StackPanel>
</StackPanel>

<StackPanel Grid.Row="1"
Grid.Column="4"
HorizontalAlignment="Stretch">
<Label Content="SplitButton" Style="{DynamicResource DescriptionHeaderStyle}" />

<Controls:SplitButton Margin="5"
Expand All @@ -549,7 +503,6 @@
<iconPacks:PackIconModern Margin="6" Kind="Book" />
</Controls:SplitButton.Icon>
</Controls:SplitButton>

</StackPanel>
</Grid>

Expand Down
2 changes: 1 addition & 1 deletion src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuCreatorsUpdate.xaml
View file
Open in desktop
Expand Up @@ -113,7 +113,7 @@
<StackPanel Margin="0 0 0 10" Orientation="Vertical">
<Controls:ToggleSwitch Margin="0 10 0 5"
Header="IsPaneOpen:"
IsChecked="{Binding ElementName=HamburgerMenuControl, Path=IsPaneOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
IsOn="{Binding ElementName=HamburgerMenuControl, Path=IsPaneOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<Controls:MetroHeader Margin="0 10 0 5" Header="DisplayMode:">
<ComboBox MinWidth="150"
Expand Down
8 changes: 4 additions & 4 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuDefault.xaml
View file
Open in desktop
Expand Up @@ -107,13 +107,13 @@
<StackPanel Margin="0 0 0 10" Orientation="Vertical">
<Controls:ToggleSwitch Margin="0 10 0 5"
Header="HamburgerMenuItem About:"
IsChecked="{Binding CanShowHamburgerAboutCommand, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
OffLabel="Disabled"
OnLabel="Enabled" />
IsOn="{Binding CanShowHamburgerAboutCommand, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
OffContent="Disabled"
OnContent="Enabled" />

<Controls:ToggleSwitch Margin="0 10 0 5"
Header="IsPaneOpen:"
IsChecked="{Binding IsHamburgerMenuPaneOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
IsOn="{Binding IsHamburgerMenuPaneOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<Controls:MetroHeader Margin="0 10 0 5" Header="PanePlacement:">
<ComboBox MinWidth="150"
Expand Down
6 changes: 0 additions & 6 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/HamburgerMenuSample.xaml
View file
Open in desktop
Expand Up @@ -12,12 +12,6 @@
mc:Ignorable="d">

<UserControl.Resources>
<Style BasedOn="{StaticResource MahApps.Styles.ToggleSwitch.Win10}" TargetType="{x:Type Controls:ToggleSwitch}">
<Setter Property="FontSize" Value="15" />
<Setter Property="Margin" Value="0" />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>

<Style BasedOn="{StaticResource MahApps.Styles.Slider.Win10}" TargetType="{x:Type Slider}" />

<Style BasedOn="{StaticResource {x:Type Controls:MetroHeader}}" TargetType="{x:Type Controls:MetroHeader}">
Expand Down
3 changes: 1 addition & 2 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml
View file
Open in desktop
Expand Up @@ -594,8 +594,7 @@
<CheckBox x:Name="ModifierKeysRequired"
Margin="{StaticResource ControlMargin}"
Content="Require modifier keys" />
<TextBlock Margin="{StaticResource ControlMargin}"
Text="Try SHIFT+D to demonstrate validation" />
<TextBlock Margin="{StaticResource ControlMargin}" Text="Try SHIFT+D to demonstrate validation" />
<Controls:HotKeyBox Margin="{StaticResource ControlMargin}"
Controls:TextBoxHelper.ClearTextButton="True"
Controls:TextBoxHelper.Watermark="Enter hot key"
Expand Down
13 changes: 6 additions & 7 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/ShowcaseFlyout.xaml
View file
Open in desktop
Expand Up @@ -129,17 +129,16 @@
Grid.Column="1"
Margin="2"
Header="Flyout closing"
IsChecked="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
OffLabel="Disabled"
OnLabel="Allowed" />
IsOn="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
OffContent="Disabled"
OnContent="Allowed" />
<controls:ToggleSwitch Grid.Row="3"
Grid.Column="1"
Margin="2"
Header="Flyout closing"
IsChecked="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
OffLabel="Disabled"
OnLabel="Allowed"
Style="{DynamicResource MahApps.Styles.ToggleSwitch.Win10}" />
IsOn="{Binding CanCloseFlyout, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
OffContent="Disabled"
OnContent="Allowed" />

</Grid>

Expand Down
4 changes: 2 additions & 2 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/HamburgerMenuRipple/HamburgerMenuRipple.xaml
View file
Open in desktop
Expand Up @@ -176,7 +176,7 @@
<StackPanel Margin="0 0 0 10" Orientation="Vertical">
<Controls:ToggleSwitch Margin="0 10 0 5"
Header="IsPaneOpen:"
IsChecked="{Binding ElementName=HamburgerMenuControl, Path=IsPaneOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
IsOn="{Binding ElementName=HamburgerMenuControl, Path=IsPaneOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<Controls:MetroHeader Margin="0 10 0 5" Header="DisplayMode:">
<ComboBox MinWidth="150"
Expand Down Expand Up @@ -264,7 +264,7 @@
<Controls:ToggleSwitch Margin="0 0 0 5" Header="Lorem ipsum dolor sit amet, consectetur adipiscing elit" />
<Controls:ToggleSwitch Margin="0 0 0 5"
Header="Ut dictum arcu egestas aliquet elementum"
IsChecked="True" />
IsOn="True" />
<Controls:ToggleSwitch Margin="0 0 0 5" Header="Pellentesque ultricies metus quis dui luctus, vel faucibus risus rhoncus" />
</StackPanel>
</UserControl>
Expand Down