Skip to content

Commit 513580d

Browse files
committed
update numberbox repeatbutton custom themeresources
1 parent c514b09 commit 513580d

1 file changed

Lines changed: 32 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: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -291,26 +291,46 @@
291291
<Grid ui:ThemeManager.HasThemeResources="True" Height="{TemplateBinding Height}">
292292
<Grid.Resources>
293293
<ui:ResourceDictionaryEx>
294-
<!--<ui:ResourceDictionaryEx.ThemeDictionaries>
294+
<ui:ResourceDictionaryEx.ThemeDictionaries>
295295
<ResourceDictionary x:Key="Light" ui:ThemeDictionary.Key="Light">
296-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
297-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
296+
<ui:StaticResource x:Key="RepeatButtonBackground" ResourceKey="TextControlButtonBackground" />
297+
<ui:StaticResource x:Key="RepeatButtonBackgroundPointerOver" ResourceKey="TextControlButtonBackgroundPointerOver" />
298+
<ui:StaticResource x:Key="RepeatButtonBackgroundPressed" ResourceKey="TextControlButtonBackgroundPressed" />
299+
<ui:StaticResource x:Key="RepeatButtonForeground" ResourceKey="TextControlButtonForeground" />
300+
<ui:StaticResource x:Key="RepeatButtonForegroundPointerOver" ResourceKey="TextControlButtonForegroundPointerOver" />
301+
<ui:StaticResource x:Key="RepeatButtonForegroundPressed" ResourceKey="TextControlButtonForegroundPressed" />
302+
<ui:StaticResource x:Key="RepeatButtonBorderBrush" ResourceKey="TextControlButtonBorderBrush" />
303+
<ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlButtonBorderBrushPointerOver" />
304+
<ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlButtonBorderBrushPressed" />
305+
<ui:StaticResource x:Key="RepeatButtonBorderBrushDisabled" ResourceKey="TextControlButtonBorderBrush" />
298306
</ResourceDictionary>
299307

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

305321
<ResourceDictionary x:Key="HighContrast" ui:ThemeDictionary.Key="HighContrast">
306-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
307-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
322+
<ui:StaticResource x:Key="RepeatButtonBackground" ResourceKey="TextControlButtonBackground" />
323+
<ui:StaticResource x:Key="RepeatButtonBackgroundPointerOver" ResourceKey="TextControlButtonBackgroundPointerOver" />
324+
<ui:StaticResource x:Key="RepeatButtonBackgroundPressed" ResourceKey="TextControlButtonBackgroundPressed" />
325+
<ui:StaticResource x:Key="RepeatButtonForeground" ResourceKey="TextControlButtonForeground" />
326+
<ui:StaticResource x:Key="RepeatButtonForegroundPointerOver" ResourceKey="TextControlButtonForegroundPointerOver" />
327+
<ui:StaticResource x:Key="RepeatButtonForegroundPressed" ResourceKey="TextControlButtonForegroundPressed" />
328+
<ui:StaticResource x:Key="RepeatButtonBorderBrush" ResourceKey="TextControlButtonBorderBrush" />
329+
<ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlButtonBorderBrushPointerOver" />
330+
<ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlButtonBorderBrushPressed" />
331+
<ui:StaticResource x:Key="RepeatButtonBorderBrushDisabled" ResourceKey="TextControlButtonBorderBrush" />
308332
</ResourceDictionary>
309-
</ui:ResourceDictionaryEx.ThemeDictionaries>-->
310-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPointerOver" ResourceKey="TextControlBorderBrush" />
311-
<ui:StaticResource x:Key="RepeatButtonBorderBrushPressed" ResourceKey="TextControlBorderBrush" />
312-
313-
333+
</ui:ResourceDictionaryEx.ThemeDictionaries>
314334
</ui:ResourceDictionaryEx>
315335
</Grid.Resources>
316336

0 commit comments

Comments
 (0)