Skip to content

Commit 7afb385

Browse files
KebooKeboo
authored
Updating style references to all use static resources (#2554)
1 parent ee7ae89 commit 7afb385

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+198
-198
lines changed

‎MahMaterialDragablzMashUp/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<CommandBinding Command="Copy" Executed="OnCopy" />
1616
</Window.CommandBindings>
1717
<controls:MetroWindow.WindowButtonCommands>
18-
<controls:WindowButtonCommands Style="{DynamicResource MahApps.Styles.WindowButtonCommands.Win10}" />
18+
<controls:WindowButtonCommands Style="{StaticResource MahApps.Styles.WindowButtonCommands.Win10}" />
1919
</controls:MetroWindow.WindowButtonCommands>
2020
<controls:MetroWindow.Flyouts>
2121
<controls:FlyoutsControl>

‎MainDemo.Wpf/Cards.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,11 @@
304304
Content="And go create"/>
305305
<RadioButton
306306
Margin="16 4 16 0"
307-
Style="{DynamicResource MaterialDesignUserForegroundRadioButton}"
307+
Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
308308
Content="This?"/>
309309
<RadioButton
310310
Margin="16 4 16 0"
311-
Style="{DynamicResource MaterialDesignUserForegroundRadioButton}"
311+
Style="{StaticResource MaterialDesignUserForegroundRadioButton}"
312312
Content="Or This?"/>
313313
<Separator Style="{StaticResource MaterialDesignLightSeparator}"/>
314314
<StackPanel

‎MainDemo.Wpf/ColorZones.xaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
<StackPanel Orientation="Horizontal">
5555
<ToggleButton
56-
Style="{DynamicResource MaterialDesignHamburgerToggleButton}"/>
56+
Style="{StaticResource MaterialDesignHamburgerToggleButton}"/>
5757

5858
<TextBlock
5959
VerticalAlignment="Center"
@@ -74,7 +74,7 @@
7474
Padding="16">
7575
<StackPanel Orientation="Horizontal">
7676
<ToggleButton
77-
Style="{DynamicResource MaterialDesignHamburgerToggleButton}"/>
77+
Style="{StaticResource MaterialDesignHamburgerToggleButton}"/>
7878

7979
<TextBlock
8080
VerticalAlignment="Center"
@@ -94,15 +94,15 @@
9494
Padding="16">
9595
<DockPanel>
9696
<ToggleButton
97-
Style="{DynamicResource MaterialDesignSwitchAccentToggleButton}"
97+
Style="{StaticResource MaterialDesignSwitchAccentToggleButton}"
9898
VerticalAlignment="Center"
9999
DockPanel.Dock="Right"/>
100100

101101
<StackPanel
102102
Orientation="Horizontal"
103103
materialDesign:RippleAssist.IsCentered="True">
104104
<ToggleButton
105-
Style="{DynamicResource MaterialDesignHamburgerToggleButton}"/>
105+
Style="{StaticResource MaterialDesignHamburgerToggleButton}"/>
106106

107107
<ComboBox
108108
SelectedIndex="0"
@@ -129,9 +129,9 @@
129129
<ColumnDefinition Width="Auto" />
130130
<ColumnDefinition Width="*" />
131131
<ColumnDefinition Width="Auto" />
132-
</Grid.ColumnDefinitions>
132+
</Grid.ColumnDefinitions>
133133
<Button
134-
Style="{DynamicResource MaterialDesignToolButton}">
134+
Style="{StaticResource MaterialDesignToolButton}">
135135
<materialDesign:PackIcon
136136
Kind="Search"
137137
Opacity=".56"/>
@@ -147,7 +147,7 @@
147147
VerticalAlignment="Center"/>
148148

149149
<Button
150-
Style="{DynamicResource MaterialDesignToolButton}"
150+
Style="{StaticResource MaterialDesignToolButton}"
151151
Grid.Column="2">
152152
<materialDesign:PackIcon
153153
Kind="Microphone"
@@ -158,7 +158,7 @@
158158
</materialDesign:ColorZone>
159159

160160
<Button
161-
Style="{DynamicResource MaterialDesignToolForegroundButton}"
161+
Style="{StaticResource MaterialDesignToolForegroundButton}"
162162
Margin="8 0 0 0"
163163
Panel.ZIndex="0">
164164
<materialDesign:PackIcon Kind="Send" />
@@ -181,7 +181,7 @@
181181
ClipToBounds="False">
182182
<StackPanel Orientation="Horizontal">
183183
<ToggleButton
184-
Style="{DynamicResource MaterialDesignHamburgerToggleButton}"/>
184+
Style="{StaticResource MaterialDesignHamburgerToggleButton}"/>
185185

186186
<TextBlock
187187
VerticalAlignment="Center"
@@ -201,7 +201,7 @@
201201
Padding="16">
202202
<StackPanel Orientation="Horizontal">
203203
<ToggleButton
204-
Style="{DynamicResource MaterialDesignHamburgerToggleButton}"/>
204+
Style="{StaticResource MaterialDesignHamburgerToggleButton}"/>
205205

206206
<TextBlock
207207
VerticalAlignment="Center"
@@ -225,7 +225,7 @@
225225

226226
<StackPanel Orientation="Horizontal">
227227
<ToggleButton
228-
Style="{DynamicResource MaterialDesignHamburgerToggleButton}"/>
228+
Style="{StaticResource MaterialDesignHamburgerToggleButton}"/>
229229

230230
<TextBlock
231231
VerticalAlignment="Center"

‎MainDemo.Wpf/Dialogs.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<Button.CommandParameter>
166166
<StackPanel Margin="16">
167167
<ProgressBar
168-
Style="{DynamicResource MaterialDesignCircularProgressBar}"
168+
Style="{StaticResource MaterialDesignCircularProgressBar}"
169169
HorizontalAlignment="Center" Margin="16"
170170
IsIndeterminate="True"
171171
Value="0" />

‎MainDemo.Wpf/Domain/DocumentationLinks.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ResourceDictionary.MergedDictionaries>
1717
<DataTemplate DataType="{x:Type domain:DocumentationLink}">
1818
<Button x:Name="Root" ToolTip="Wiki Article" ToolTipService.InitialShowDelay="0"
19-
Style="{DynamicResource MaterialDesignFlatButton}"
19+
Style="{StaticResource MaterialDesignFlatButton}"
2020
Command="{Binding Open}">
2121
<StackPanel Orientation="Horizontal">
2222
<materialDesign:PackIcon x:Name="PackIcon" Kind="BookOpenVariant" VerticalAlignment="Center" />

‎MainDemo.Wpf/Domain/IconPackViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ RenderTargetBitmap RenderImage(int size)
169169
var packIcon = new PackIcon
170170
{
171171
Kind = PackIconKind,
172-
Background = new SolidColorBrush(GeneratedIconBackground),
173-
Foreground = new SolidColorBrush(GeneratedIconForeground),
172+
Background = new SolidColorBrush(Colors.Transparent),
173+
Foreground = new SolidColorBrush(Color.FromRgb(0x17, 0x92, 0x87)),
174174
Width = size,
175175
Height = size,
176176
Style = (Style)Application.Current.FindResource(typeof(PackIcon))

‎MainDemo.Wpf/Domain/SampleDialog.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<RowDefinition />
1919
</Grid.RowDefinitions>
2020
<TextBlock>New contact:</TextBlock>
21-
<TextBox wpf:HintAssist.Hint="Name" Style="{DynamicResource MaterialDesignFloatingHintTextBox}"
21+
<TextBox wpf:HintAssist.Hint="Name" Style="{StaticResource MaterialDesignFloatingHintTextBox}"
2222
Margin="0 6 0 0"
2323
FontSize="18" Grid.Row="1">
2424
<TextBox.Text>
@@ -29,20 +29,20 @@
2929
</Binding>
3030
</TextBox.Text>
3131
</TextBox>
32-
<TextBox wpf:HintAssist.Hint="Number" Style="{DynamicResource MaterialDesignFloatingHintTextBox}"
32+
<TextBox wpf:HintAssist.Hint="Number" Style="{StaticResource MaterialDesignFloatingHintTextBox}"
3333
Margin="0 8 0 0"
3434
FontSize="16" Grid.Row="2"
3535
/>
3636
<StackPanel Orientation="Horizontal" Grid.Row="3"
3737
Margin="0 16 0 0">
38-
<Button IsDefault="True" Style="{DynamicResource MaterialDesignFlatButton}"
38+
<Button IsDefault="True" Style="{StaticResource MaterialDesignFlatButton}"
3939
Command="{x:Static wpf:DialogHost.CloseDialogCommand}">
4040
<Button.CommandParameter>
4141
<system:Boolean>True</system:Boolean>
4242
</Button.CommandParameter>
4343
ACCEPT
4444
</Button>
45-
<Button IsCancel="True" Margin="8 0 0 0" Style="{DynamicResource MaterialDesignFlatButton}"
45+
<Button IsCancel="True" Margin="8 0 0 0" Style="{StaticResource MaterialDesignFlatButton}"
4646
Command="{x:Static wpf:DialogHost.CloseDialogCommand}">
4747
<Button.CommandParameter>
4848
<system:Boolean>False</system:Boolean>

‎MainDemo.Wpf/Domain/SampleMessageDialog.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
Margin="0 6 0 0"
1717
FontSize="18" Grid.Row="0"/>
1818
<Button Grid.Row="1"
19-
IsDefault="True" Style="{DynamicResource MaterialDesignFlatButton}"
19+
IsDefault="True" Style="{StaticResource MaterialDesignFlatButton}"
2020
HorizontalAlignment="Right"
2121
Margin="16 16 16 0"
2222
Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}">

‎MainDemo.Wpf/Domain/SampleProgressDialog.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
mc:Ignorable="d">
77
<ProgressBar Width="24" Height="24" Margin="16"
8-
Style="{DynamicResource MaterialDesignCircularProgressBar}"
8+
Style="{StaticResource MaterialDesignCircularProgressBar}"
99
IsIndeterminate="True"
1010
Value="33"/>
1111
</UserControl>

‎MainDemo.Wpf/Drawers.xaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@
7272
CommandParameter="{x:Static Dock.Left}"
7373
Margin="4"
7474
HorizontalAlignment="Center"
75-
Style="{DynamicResource MaterialDesignFlatButton}"
75+
Style="{StaticResource MaterialDesignFlatButton}"
7676
Content="CLOSE THIS"/>
7777

7878
<Button
7979
Command="{x:Static materialDesign:DrawerHost.CloseDrawerCommand}"
8080
Margin="4"
8181
HorizontalAlignment="Center"
82-
Style="{DynamicResource MaterialDesignFlatButton}"
82+
Style="{StaticResource MaterialDesignFlatButton}"
8383
Content="CLOSE ALL"/>
8484
</StackPanel>
8585
</materialDesign:DrawerHost.LeftDrawerContent>
@@ -96,15 +96,15 @@
9696

9797
<Button
9898
Command="{x:Static materialDesign:DrawerHost.CloseDrawerCommand}"
99-
Style="{DynamicResource MaterialDesignFlatButton}"
99+
Style="{StaticResource MaterialDesignFlatButton}"
100100
Margin="4"
101101
VerticalAlignment="Center"
102102
Content="CLOSE ALL"/>
103103

104104
<Button
105105
Command="{x:Static materialDesign:DrawerHost.CloseDrawerCommand}"
106106
CommandParameter="{x:Static Dock.Top}"
107-
Style="{DynamicResource MaterialDesignFlatButton}"
107+
Style="{StaticResource MaterialDesignFlatButton}"
108108
Margin="4"
109109
VerticalAlignment="Center"
110110
Content="CLOSE THIS"/>
@@ -123,14 +123,14 @@
123123
CommandParameter="{x:Static Dock.Right}"
124124
Margin="4"
125125
HorizontalAlignment="Center"
126-
Style="{DynamicResource MaterialDesignFlatButton}"
126+
Style="{StaticResource MaterialDesignFlatButton}"
127127
Content="CLOSE THIS"/>
128128

129129
<Button
130130
Command="{x:Static materialDesign:DrawerHost.CloseDrawerCommand}"
131131
Margin="4"
132132
HorizontalAlignment="Center"
133-
Style="{DynamicResource MaterialDesignFlatButton}"
133+
Style="{StaticResource MaterialDesignFlatButton}"
134134
Content="CLOSE ALL"/>
135135
</StackPanel>
136136
</materialDesign:DrawerHost.RightDrawerContent>
@@ -148,15 +148,15 @@
148148

149149
<Button
150150
Command="{x:Static materialDesign:DrawerHost.CloseDrawerCommand}"
151-
Style="{DynamicResource MaterialDesignFlatButton}"
151+
Style="{StaticResource MaterialDesignFlatButton}"
152152
Margin="4"
153153
VerticalAlignment="Center"
154154
Content="CLOSE ALL"/>
155155

156156
<Button
157157
Command="{x:Static materialDesign:DrawerHost.CloseDrawerCommand}"
158158
CommandParameter="{x:Static Dock.Bottom}"
159-
Style="{DynamicResource MaterialDesignFlatButton}"
159+
Style="{StaticResource MaterialDesignFlatButton}"
160160
Margin="4"
161161
VerticalAlignment="Center"
162162
Content="CLOSE THIS"/>
@@ -215,7 +215,7 @@
215215
Grid.Row="1"
216216
Grid.Column="1"
217217
Margin="4"
218-
Style="{DynamicResource MaterialDesignRaisedAccentButton}"
218+
Style="{StaticResource MaterialDesignRaisedAccentButton}"
219219
Content="{materialDesign:PackIcon Kind=ArrowAll}"/>
220220
</Grid>
221221

0 commit comments

Comments
 (0)