Skip to content

Commit 8f0da55

Browse files
mou-hazmou-haz
committed
update numberbox repeatbutton custom themeresources
1 parent c514b09 commit 8f0da55

1 file changed

Lines changed: 33 additions & 12 deletions

File tree

  • source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/NumberBox

‎source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/NumberBox/NumberBox.xaml‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
66
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
77
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
8+
xmlns:m="http://schemas.inkore.net/lib/ui/wpf/modern"
89
xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common;assembly=iNKORE.UI.WPF.Modern"
910
xmlns:sys="clr-namespace:System;assembly=netstandard">
1011

@@ -291,26 +292,46 @@
291292
<Grid ui:ThemeManager.HasThemeResources="True" Height="{TemplateBinding Height}">
292293
<Grid.Resources>
293294
<ui:ResourceDictionaryEx>
294-
<!--<ui:ResourceDictionaryEx.ThemeDictionaries>
295+
<ui:ResourceDictionaryEx.ThemeDictionaries>
295296
<ResourceDictionary x:Key="Light" ui:ThemeDictionary.Key="Light">
296-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
297-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
297+
<m:StaticResource x:Key="RepeatButtonBackground" ResourceKey="TextControlButtonBackground" />
298+
<m:StaticResource x:Key="RepeatButtonBackgroundPointerOver" ResourceKey="TextControlButtonBackgroundPointerOver" />
299+
<m:StaticResource x:Key="RepeatButtonBackgroundPressed" ResourceKey="TextControlButtonBackgroundPressed" />
300+
<m:StaticResource x:Key="RepeatButtonForeground" ResourceKey="TextControlButtonForeground" />
301+
<m:StaticResource x:Key="RepeatButtonForegroundPointerOver" ResourceKey="TextControlButtonForegroundPointerOver" />
302+
<m:StaticResource x:Key="RepeatButtonForegroundPressed" ResourceKey="TextControlButtonForegroundPressed" />
303+
<m:StaticResource x:Key="RepeatButtonBorderBrush" ResourceKey="TextControlButtonBorderBrush" />
304+
<ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlButtonBorderBrushPointerOver" />
305+
<ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlButtonBorderBrushPressed" />
306+
<ui:StaticResource x:Key="RepeatButtonBorderBrushDisabled" ResourceKey="TextControlButtonBorderBrush" />
298307
</ResourceDictionary>
299308

300309
<ResourceDictionary x:Key="Dark" ui:ThemeDictionary.Key="Dark">
301-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
302-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
310+
<m:StaticResource x:Key="RepeatButtonBackground" ResourceKey="TextControlButtonBackground" />
311+
<m:StaticResource x:Key="RepeatButtonBackgroundPointerOver" ResourceKey="TextControlButtonBackgroundPointerOver" />
312+
<m:StaticResource x:Key="RepeatButtonBackgroundPressed" ResourceKey="TextControlButtonBackgroundPressed" />
313+
<m:StaticResource x:Key="RepeatButtonForeground" ResourceKey="TextControlButtonForeground" />
314+
<m:StaticResource x:Key="RepeatButtonForegroundPointerOver" ResourceKey="TextControlButtonForegroundPointerOver" />
315+
<m:StaticResource x:Key="RepeatButtonForegroundPressed" ResourceKey="TextControlButtonForegroundPressed" />
316+
<m:StaticResource x:Key="RepeatButtonBorderBrush" ResourceKey="TextControlButtonBorderBrush" />
317+
<ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlButtonBorderBrushPointerOver" />
318+
<ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlButtonBorderBrushPressed" />
319+
<ui:StaticResource x:Key="RepeatButtonBorderBrushDisabled" ResourceKey="TextControlButtonBorderBrush" />
303320
</ResourceDictionary>
304321

305322
<ResourceDictionary x:Key="HighContrast" ui:ThemeDictionary.Key="HighContrast">
306-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
307-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
323+
<m:StaticResource x:Key="RepeatButtonBackground" ResourceKey="TextControlButtonBackground" />
324+
<m:StaticResource x:Key="RepeatButtonBackgroundPointerOver" ResourceKey="TextControlButtonBackgroundPointerOver" />
325+
<m:StaticResource x:Key="RepeatButtonBackgroundPressed" ResourceKey="TextControlButtonBackgroundPressed" />
326+
<m:StaticResource x:Key="RepeatButtonForeground" ResourceKey="TextControlButtonForeground" />
327+
<m:StaticResource x:Key="RepeatButtonForegroundPointerOver" ResourceKey="TextControlButtonForegroundPointerOver" />
328+
<m:StaticResource x:Key="RepeatButtonForegroundPressed" ResourceKey="TextControlButtonForegroundPressed" />
329+
<m:StaticResource x:Key="RepeatButtonBorderBrush" ResourceKey="TextControlButtonBorderBrush" />
330+
<ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlButtonBorderBrushPointerOver" />
331+
<ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlButtonBorderBrushPressed" />
332+
<ui:StaticResource x:Key="RepeatButtonBorderBrushDisabled" ResourceKey="TextControlButtonBorderBrush" />
308333
</ResourceDictionary>
309-
</ui:ResourceDictionaryEx.ThemeDictionaries>-->
310-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
311-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
312-
313-
334+
</ui:ResourceDictionaryEx.ThemeDictionaries>
314335
</ui:ResourceDictionaryEx>
315336
</Grid.Resources>
316337

0 commit comments

Comments
 (0)