|
101 | 101 | Cursor="Hand"
|
102 | 102 | VerticalAlignment="Center"
|
103 | 103 | />
|
104 |
| - <controlzEx:PopupEx x:Name="PART_Popup" IsOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPopupOpen, Mode=TwoWay}" |
105 |
| - CustomPopupPlacementCallback="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=PopupPlacementMethod}" |
| 104 | + <controlzEx:PopupEx x:Name="PART_Popup" |
| 105 | + IsOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPopupOpen, Mode=TwoWay}" |
| 106 | + CustomPopupPlacementCallback="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=PopupPlacementMethod}" |
106 | 107 | HorizontalOffset="5"
|
107 | 108 | VerticalOffset="5"
|
108 | 109 | PlacementTarget="{Binding ElementName=PART_Toggle}"
|
|
114 | 115 | FontSize="15"
|
115 | 116 | FontWeight="Regular"
|
116 | 117 | Padding="{TemplateBinding Padding}"
|
117 |
| - RenderOptions.ClearTypeHint="Enabled" |
| 118 | + RenderOptions.ClearTypeHint="Enabled" |
118 | 119 | Margin="5">
|
119 | 120 | <wpf:Card.Resources>
|
120 | 121 | <Style TargetType="Button" BasedOn="{StaticResource MaterialDesignPopupBoxButton}" />
|
|
305 | 306 | </Storyboard>
|
306 | 307 | </ControlTemplate.Resources>
|
307 | 308 | <Grid>
|
308 |
| - <ToggleButton x:Name="PART_Toggle" Style="{StaticResource ToggleButtonStyle}" IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPopupOpen, Mode=TwoWay}" |
| 309 | + <ToggleButton x:Name="PART_Toggle" Style="{StaticResource ToggleButtonStyle}" |
| 310 | + IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPopupOpen, Mode=TwoWay}" |
309 | 311 | Cursor="Hand"
|
310 | 312 | Background="{TemplateBinding Background}"
|
311 | 313 | BorderBrush="{TemplateBinding BorderBrush}"
|
312 | 314 | Foreground="{TemplateBinding Foreground}"
|
313 | 315 | VerticalAlignment="Stretch"
|
314 |
| - HorizontalAlignment="Stretch" |
| 316 | + HorizontalAlignment="Stretch" |
315 | 317 | ToolTip="{TemplateBinding ToolTip}"
|
316 | 318 | ToolTipService.Placement="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:PopupBox}, Path=(ToolTipService.Placement)}">
|
317 | 319 | <Grid>
|
|
332 | 334 | </ToggleButton>
|
333 | 335 | <controlzEx:PopupEx x:Name="PART_Popup"
|
334 | 336 | IsOpen="False"
|
335 |
| - CustomPopupPlacementCallback="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=PopupPlacementMethod}" |
| 337 | + CustomPopupPlacementCallback="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=PopupPlacementMethod}" |
336 | 338 | PlacementTarget="{Binding ElementName=PART_Toggle}"
|
337 | 339 | Placement="Custom"
|
338 |
| - PopupAnimation="None" |
| 340 | + PopupAnimation="None" |
339 | 341 | AllowsTransparency="True">
|
340 | 342 | <Grid>
|
341 | 343 | <!-- with PopupBox.PopupMode == MouseOverEager the popup is always open, with
|
342 |
| - content hidden. but Transparent doesnt seem to register hit test in the popup. |
| 344 | + content hidden. but Transparent doesn't seem to register hit test in the popup. |
343 | 345 | this opacity is the lowest I could get to register hit test. might try and speak
|
344 | 346 | to MS about this one, I *think* it is a bug -->
|
345 | 347 | <Border Background="White" Opacity="0.002" />
|
|
377 | 379 | <BeginStoryboard Storyboard="{StaticResource Close}" />
|
378 | 380 | </Trigger.ExitActions>
|
379 | 381 | </Trigger>
|
380 |
| - <Trigger Property="PopupMode" Value="MouseOverEager"> |
| 382 | + <MultiTrigger> |
| 383 | + <MultiTrigger.Conditions> |
| 384 | + <Condition Property="PopupMode" Value="MouseOverEager" /> |
| 385 | + <Condition Property="IsVisible" Value="True" /> |
| 386 | + </MultiTrigger.Conditions> |
381 | 387 | <Setter TargetName="PART_Popup" Property="IsOpen" Value="True" />
|
382 |
| - </Trigger> |
| 388 | + </MultiTrigger> |
383 | 389 | </ControlTemplate.Triggers>
|
384 | 390 | </ControlTemplate>
|
385 | 391 | </Setter.Value>
|
|
0 commit comments