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

Improving flyout styling #676

Merged
merged 4 commits into from
Jun 30, 2023
Merged

Improving flyout styling #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cc624c
ComboBox
niels9001 Jun 28, 2023
084e0a9
Update ToolTip.xaml
niels9001 Jun 28, 2023
36b75b0
AutoSuggestBox
niels9001 Jun 28, 2023
6c98435
Flyout
niels9001 Jun 28, 2023
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
4 changes: 2 additions & 2 deletions src/Wpf.Ui/Styles/Controls/AutoSuggestBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@
Margin="0"
Padding="0,6,0,6"
HorizontalAlignment="Stretch"
BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
BorderBrush="{DynamicResource SurfaceStrokeColorFlyoutBrush}"
BorderThickness="1"
CornerRadius="8"
SnapsToDevicePixels="True">
<Border.Background>
<SolidColorBrush Color="{DynamicResource SystemFillColorSolidNeutralBackground}" />
<SolidColorBrush Color="{DynamicResource SolidBackgroundFillColorTertiary}" />
</Border.Background>
<ListView
x:Name="PART_SuggestionsList"
Expand Down
4 changes: 2 additions & 2 deletions src/Wpf.Ui/Styles/Controls/ComboBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,15 +300,15 @@
x:Name="DropDownBorder"
Margin="0"
Padding="0,4,0,6"
BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
BorderBrush="{DynamicResource SurfaceStrokeColorFlyoutBrush}"
BorderThickness="1"
CornerRadius="{DynamicResource PopupCornerRadius}"
SnapsToDevicePixels="True">
<Border.RenderTransform>
<TranslateTransform />
</Border.RenderTransform>
<Border.Background>
<SolidColorBrush Color="{DynamicResource SystemFillColorSolidNeutralBackground}" />
<SolidColorBrush Color="{DynamicResource SolidBackgroundFillColorTertiary}" />
</Border.Background>
<Grid>
<controls:DynamicScrollViewer
Expand Down
6 changes: 3 additions & 3 deletions src/Wpf.Ui/Styles/Controls/Flyout.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
<Style x:Key="DefaultFlyoutStyle" TargetType="{x:Type controls:Flyout}">
<Setter Property="Background">
<Setter.Value>
<SolidColorBrush Color="{DynamicResource SystemFillColorSolidNeutralBackground}" />
<SolidColorBrush Color="{DynamicResource SolidBackgroundFillColorTertiary}" />
</Setter.Value>
</Setter>
<Setter Property="BorderBrush">
<Setter.Value>
<SolidColorBrush Color="{DynamicResource ControlStrokeColorSecondary}" />
<SolidColorBrush Color="{DynamicResource SurfaceStrokeColorFlyout}" />
</Setter.Value>
</Setter>
<Setter Property="Margin" Value="0" />
Expand Down Expand Up @@ -80,4 +80,4 @@

<Style BasedOn="{StaticResource DefaultFlyoutStyle}" TargetType="{x:Type controls:Flyout}" />

</ResourceDictionary>
</ResourceDictionary>
6 changes: 3 additions & 3 deletions src/Wpf.Ui/Styles/Controls/ToolTip.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
</Setter>
<Setter Property="Background">
<Setter.Value>
<SolidColorBrush Color="{DynamicResource SystemFillColorSolidNeutralBackground}" />
<SolidColorBrush Color="{DynamicResource SolidBackgroundFillColorTertiary}" />
</Setter.Value>
</Setter>
<Setter Property="BorderBrush">
<Setter.Value>
<SolidColorBrush Color="{DynamicResource SolidBackgroundFillColorBase}" />
<SolidColorBrush Color="{DynamicResource SurfaceStrokeColorFlyout}" />
</Setter.Value>
</Setter>
<Setter Property="SnapsToDevicePixels" Value="True" />
Expand Down Expand Up @@ -75,4 +75,4 @@

<Style BasedOn="{StaticResource DefaultToolTipStyle}" TargetType="{x:Type ToolTip}" />

</ResourceDictionary>
</ResourceDictionary>