Browse Source
Merge branch 'master' into render-inside-win-ui-comp-tree
tmp-winuicomp_with_manual_fbo
danwalmsley
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
src/Avalonia.Controls/Primitives/PopupPositioning/ManagedPopupPositioner.cs
-
src/Avalonia.Themes.Fluent/Button.xaml
|
|
|
@ -221,7 +221,7 @@ namespace Avalonia.Controls.Primitives.PopupPositioning |
|
|
|
|
|
|
|
if (!FitsInBounds(unconstrainedRect, PopupAnchor.Bottom)) |
|
|
|
{ |
|
|
|
unconstrainedRect = unconstrainedRect.WithHeight(bounds.Height - unconstrainedRect.Y); |
|
|
|
unconstrainedRect = unconstrainedRect.WithHeight(bounds.Bottom - unconstrainedRect.Y); |
|
|
|
} |
|
|
|
|
|
|
|
if (IsValid(unconstrainedRect)) |
|
|
|
|
|
|
|
@ -77,7 +77,7 @@ |
|
|
|
<Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentButtonForegroundPressed}" /> |
|
|
|
</Style> |
|
|
|
|
|
|
|
<Style Selector=":is(Button)"> |
|
|
|
<Style Selector="Button, RepeatButton, ToggleButton"> |
|
|
|
<Setter Property="RenderTransform" Value="none" /> |
|
|
|
<Setter Property="Transitions"> |
|
|
|
<Transitions> |
|
|
|
@ -86,7 +86,7 @@ |
|
|
|
</Setter> |
|
|
|
</Style> |
|
|
|
|
|
|
|
<Style Selector=":is(Button):pressed"> |
|
|
|
<Style Selector="Button:pressed, RepeatButton:pressed, ToggleButton:pressed"> |
|
|
|
<Setter Property="RenderTransform" Value="scale(0.98)" /> |
|
|
|
</Style> |
|
|
|
|
|
|
|
|
