Skip to content
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

Port microsoft/microsoft-ui-xaml#3936 #480

Merged
merged 1 commit into from
Jul 10, 2022
Merged

Port microsoft/microsoft-ui-xaml#3936 #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions ModernWpf.Controls/Flyout/FlyoutPresenter.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<Setter Property="Foreground" Value="{DynamicResource SystemControlForegroundBaseHighBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource FlyoutBorderThemeBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource FlyoutBorderThemeThickness}" />
<Setter Property="Padding" Value="{DynamicResource FlyoutContentThemePadding}" />
<Setter Property="Padding" Value="{DynamicResource FlyoutContentPadding}" />
<Setter Property="MinWidth" Value="{DynamicResource FlyoutThemeMinWidth}" />
<Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
<Setter Property="MinHeight" Value="{DynamicResource FlyoutThemeMinHeight}" />
Expand All @@ -39,8 +39,7 @@
<Border
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}"
Padding="{DynamicResource FlyoutBorderThemePadding}">
CornerRadius="{TemplateBinding CornerRadius}">
<ScrollViewer
x:Name="ScrollViewer"
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
Expand Down
3 changes: 2 additions & 1 deletion ModernWpf/ControlsResources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
<sys:Double x:Key="ToggleSwitchPreContentMargin">6</sys:Double>
<sys:Double x:Key="ToggleSwitchPostContentMargin">6</sys:Double>
<sys:Double x:Key="ToggleSwitchThemeMinWidth">154</sys:Double>

<Thickness x:Key="FlyoutContentPadding">12</Thickness>

<ControlTemplate x:Key="TextControlValidationErrorTemplate">
<Grid SnapsToDevicePixels="True">
<AdornedElementPlaceholder />
Expand Down
2 changes: 1 addition & 1 deletion ModernWpf/ThemeResources/Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@
<Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
<Thickness x:Key="FlyoutBorderThemePadding">0</Thickness>
<Thickness x:Key="FlyoutContentThemePadding">12,11,12,12</Thickness>
<m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
<m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
<m:StaticResource x:Key="FlyoutBorderThemeBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />

<!-- Resources for HyperlinkButton -->
Expand Down
6 changes: 3 additions & 3 deletions ModernWpf/ThemeResources/HighContrast.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@
<Thickness x:Key="CommandBarOverflowPresenterBorderUpPadding">0</Thickness>

<!-- Resources for CommandBarFlyout -->
<Thickness x:Key="CommandBarFlyoutBorderThemeThickness">1</Thickness>
<Thickness x:Key="CommandBarFlyoutBorderThemeThickness">2</Thickness>
<Thickness x:Key="CommandBarFlyoutBorderUpThemeThickness">1,1,1,0</Thickness>
<Thickness x:Key="CommandBarFlyoutBorderDownThemeThickness">1,0,1,1</Thickness>
<SolidColorBrush x:Key="CommandBarFlyoutButtonBackground" Color="{m:ThemeResource SystemColorButtonFaceColor}" />
Expand Down Expand Up @@ -775,8 +775,8 @@
<Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
<Thickness x:Key="FlyoutBorderThemePadding">0</Thickness>
<Thickness x:Key="FlyoutContentThemePadding">12,11,12,12</Thickness>
<m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="SystemControlPageBackgroundChromeMediumLowBrush" />
<m:StaticResource x:Key="FlyoutBorderThemeBrush" ResourceKey="SystemControlTransientBorderBrush" />
<m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="SystemColorWindowColorBrush" />
<m:StaticResource x:Key="FlyoutBorderThemeBrush" ResourceKey="SystemColorWindowTextColorBrush" />

<!-- Resources for HyperlinkButton -->
<m:StaticResource x:Key="HyperlinkButtonForeground" ResourceKey="SystemControlHyperlinkTextBrush" />
Expand Down
2 changes: 1 addition & 1 deletion ModernWpf/ThemeResources/Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@
<Thickness x:Key="FlyoutBorderThemeThickness">1</Thickness>
<Thickness x:Key="FlyoutBorderThemePadding">0</Thickness>
<Thickness x:Key="FlyoutContentThemePadding">12,11,12,12</Thickness>
<m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
<m:StaticResource x:Key="FlyoutPresenterBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
<m:StaticResource x:Key="FlyoutBorderThemeBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />

<!-- Resources for HyperlinkButton -->
Expand Down