Skip to content

Commit 0728b1d

Browse files
authored
Merge pull request #9398 from harshit7962/partTemplateParity
Adding Part_ Template parity
2 parents 6548fdd + a28adba commit 0728b1d

File tree

3 files changed

+33
-8
lines changed

3 files changed

+33
-8
lines changed

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ComboBox.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
</Grid>
267267
</Grid>
268268
<Popup
269-
x:Name="Popup"
269+
x:Name="PART_Popup"
270270
MinWidth="{TemplateBinding ActualWidth}"
271271
VerticalAlignment="Center"
272272
AllowsTransparency="True"
@@ -357,7 +357,7 @@
357357
<Trigger Property="HasItems" Value="False">
358358
<Setter TargetName="DropDownBorder" Property="MinHeight" Value="{StaticResource ComboBoxPopupMinHeight}" />
359359
</Trigger>
360-
<Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="False">
360+
<Trigger SourceName="PART_Popup" Property="Popup.AllowsTransparency" Value="False">
361361
<Setter TargetName="DropDownBorder" Property="CornerRadius" Value="0" />
362362
</Trigger>
363363
<Trigger Property="IsGrouping" Value="True">

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/DatePicker.xaml

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,34 @@
4646
<Setter Property="Template">
4747
<Setter.Value>
4848
<ControlTemplate TargetType="{x:Type DatePickerTextBox}">
49-
<Border Margin="{TemplateBinding Margin}">
50-
<Decorator x:Name="PART_ContentHost" Margin="{TemplateBinding Padding}" />
51-
</Border>
49+
<Grid>
50+
<VisualStateManager.VisualStateGroups>
51+
<VisualStateGroup Name="WatermarkStates">
52+
<VisualStateGroup.Transitions>
53+
<VisualTransition GeneratedDuration="0" />
54+
</VisualStateGroup.Transitions>
55+
<VisualState Name="Unwatermarked" />
56+
<VisualState Name="Watermarked">
57+
<Storyboard>
58+
<DoubleAnimation Storyboard.TargetName="PART_Watermark" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
59+
</Storyboard>
60+
</VisualState>
61+
</VisualStateGroup>
62+
</VisualStateManager.VisualStateGroups>
63+
64+
<Border Margin="{TemplateBinding Margin}">
65+
<Decorator x:Name="PART_ContentHost" Margin="{TemplateBinding Padding}" />
66+
</Border>
67+
<Border Margin="{TemplateBinding Margin}">
68+
<!-- This is a placeholder for DatePickerTextBox -->
69+
<ContentControl
70+
x:Name="PART_Watermark"
71+
Opacity="0"
72+
Margin="{TemplateBinding Padding}"
73+
Focusable="False"
74+
IsHitTestVisible="False" />
75+
</Border>
76+
</Grid>
5277
</ControlTemplate>
5378
</Setter.Value>
5479
</Setter>
@@ -104,7 +129,7 @@
104129
BorderBrush="{TemplateBinding BorderBrush}"
105130
BorderThickness="{TemplateBinding BorderThickness}"
106131
CornerRadius="{TemplateBinding Border.CornerRadius}">
107-
<Grid FocusManager.FocusedElement="{Binding ElementName=PART_Button}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
132+
<Grid x:Name="PART_Root" FocusManager.FocusedElement="{Binding ElementName=PART_Button}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
108133
<Grid.ColumnDefinitions>
109134
<ColumnDefinition Width="*" />
110135
<ColumnDefinition Width="Auto" />

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/MenuItem.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</Grid>
7676

7777
<Popup
78-
x:Name="Popup"
78+
x:Name="PART_Popup"
7979
Grid.Row="1"
8080
Grid.Column="0"
8181
AllowsTransparency="True"
@@ -334,7 +334,7 @@
334334
</Border>
335335

336336
<Popup
337-
x:Name="Popup"
337+
x:Name="PART_Popup"
338338
Grid.Row="1"
339339
AllowsTransparency="True"
340340
Focusable="False"

0 commit comments

Comments
 (0)