Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.

Fixed regarding material design dependency. #50

Merged
PTKu merged 1 commit into from
May 6, 2021
Merged

Fixed regarding material design dependency. #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/TcoApplicationExamples/TcoApplicationExamples.Wpf/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:TcoApplicationExamples.Wpf"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
StartupUri="MainWindow.xaml">
<Application.Resources />
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<materialDesign:BundledTheme
BaseTheme="Inherit"
ColorAdjustment="{materialDesign:ColorAdjustment}"
PrimaryColor="BlueGrey"
SecondaryColor="LightGreen" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>
15 changes: 12 additions & 3 deletions ...onExamples/TcoApplicationExamples.Wpf/Tutorial/101_Color_sequencer/Color_ExampleView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:PlcAppExamples"
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vortex="http://vortex.mts/xaml"
d:DesignHeight="450"
Expand Down Expand Up @@ -33,15 +34,23 @@
<UniformGrid Columns="3">
<StackPanel>
<Rectangle Height="5" Fill="Red" />
<ToggleButton IsChecked="{Binding Color_Example.Colors._lightR_IsOn.Cyclic}">Red</ToggleButton>
<ToggleButton
IsChecked="{Binding Color_Example.Colors._lightR_IsOn.Cyclic}"
materialDesign:ToggleButtonAssist.OnContent="{materialDesign:PackIcon Kind=LightbulbOutline}"
Content="{materialDesign:PackIcon Kind=LightbulbOffOutline}"
Style="{StaticResource MaterialDesignActionToggleButton}" />
</StackPanel>
<StackPanel>
<Rectangle Height="5" Fill="Green" />
<ToggleButton IsChecked="{Binding Color_Example.Colors._lightG_IsOn.Cyclic}">Green</ToggleButton>
<ToggleButton IsChecked="{Binding Color_Example.Colors._lightG_IsOn.Cyclic}" materialDesign:ToggleButtonAssist.OnContent="{materialDesign:PackIcon Kind=LightbulbOutline}"
Content="{materialDesign:PackIcon Kind=LightbulbOffOutline}"
Style="{StaticResource MaterialDesignActionToggleButton}" />
</StackPanel>
<StackPanel>
<Rectangle Height="5" Fill="Blue" />
<ToggleButton IsChecked="{Binding Color_Example.Colors._lightB_IsOn.Cyclic}">Blue</ToggleButton>
<ToggleButton IsChecked="{Binding Color_Example.Colors._lightB_IsOn.Cyclic}" materialDesign:ToggleButtonAssist.OnContent="{materialDesign:PackIcon Kind=LightbulbOutline}"
Content="{materialDesign:PackIcon Kind=LightbulbOffOutline}"
Style="{StaticResource MaterialDesignActionToggleButton}" />
</StackPanel>

</UniformGrid>
Expand Down