Skip to content

fix: CalendarDatePicker icon disappears when multiple instances are used #1452

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

Merged
pomianowski merged 2 commits into from
Jun 16, 2025
Merged

fix: CalendarDatePicker icon disappears when multiple instances are used #1452

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6eabad
Fix CalendarDatePicker icon disappears when multiple instances are used
jbryknar Jun 13, 2025
43a22b7
Merge branch 'main' into feature/1399-CalendarDatePicker_icon_disappe…
pomianowski Jun 16, 2025
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
12 changes: 6 additions & 6 deletions src/Wpf.Ui/Controls/CalendarDatePicker/CalendarDatePicker.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
<ResourceDictionary Source="pack://application:,,,/Wpf.Ui;component/Controls/Button/Button.xaml" />
</ResourceDictionary.MergedDictionaries>

<controls:SymbolIcon
x:Key="CalendarPickerIcon"
x:Shared="False"
Symbol="CalendarRtl24" />

<Style
x:Key="DefaultUiCalendarDatePickerStyle"
BasedOn="{StaticResource DefaultUiButtonStyle}"
TargetType="{x:Type controls:CalendarDatePicker}">
<Setter Property="Icon">
<Setter.Value>
<controls:SymbolIcon Symbol="CalendarRtl24" />
</Setter.Value>
</Setter>
<Setter Property="Icon" Value="{StaticResource CalendarPickerIcon}" />
</Style>

<Style BasedOn="{StaticResource DefaultUiCalendarDatePickerStyle}" TargetType="{x:Type controls:CalendarDatePicker}" />

</ResourceDictionary>
Loading