Skip to content

Added Combobox dense class to be consistent with TextBox dense class #462

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

Merged
merged 2 commits into from
Jul 16, 2025
Merged

Added Combobox dense class to be consistent with TextBox dense class #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb416a4
* added .dense class to ComboBox Theme as an equivalent to the TextBo…
WhiteMohawk May 27, 2025
5c851c1
Revert default RectHollowClipConverter parameters, move change to Com…
SKProCH Jul 16, 2025
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
9 changes: 9 additions & 0 deletions Material.Avalonia.Demo/Pages/ComboBoxesDemo.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@
<TextBlock Text="Item 4" />
</ComboBox>
</showMeTheXaml:XamlDisplay>
<showMeTheXaml:XamlDisplay UniqueId="ComboBoxesDense">
<ComboBox Theme="{StaticResource MaterialOutlineComboBox}" assist:ComboBoxAssist.Label="ComboBoxDense"
Classes="dense">
<TextBlock Text="Item 1" />
<TextBlock Text="Item 2" />
<TextBlock Text="Item 3" />
<TextBlock Text="Item 4" />
</ComboBox>
</showMeTheXaml:XamlDisplay>

<showMeTheXaml:XamlDisplay UniqueId="ComboBoxesError">
<ComboBox PlaceholderText="Select a Item">
Expand Down
24 changes: 20 additions & 4 deletions Material.Styles/Resources/Themes/ComboBox.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
</Design.PreviewWith>


<converters:RectHollowClipConverter x:Key="RectangleHollowGeometry" />
<parameters:RectHollowClipParameter x:Key="OutlineTextBoxClippingParameter" Margin="8,0" Offset="4,-8" />
<converters:RectHollowClipConverter x:Key="ComboBoxRectHollowClipConverter" />
<parameters:RectHollowClipParameter x:Key="OutlineComboBoxClippingParameter" Margin="8,0" Offset="4,-4" />

<!-- TODO: Rework combobox styles-->
<!-- Default -->
Expand Down Expand Up @@ -301,7 +301,8 @@
BorderThickness="{TemplateBinding BorderThickness}"
BorderBrush="{TemplateBinding BorderBrush}">
<Border.Clip>
<MultiBinding Converter="{StaticResource RectangleHollowGeometry}">
<MultiBinding Converter="{StaticResource ComboBoxRectHollowClipConverter}"
ConverterParameter="{StaticResource OutlineComboBoxClippingParameter}">
<Binding ElementName="PART_Border" Path="Bounds" />
<Binding ElementName="watermarkRoot" Path="Bounds" />
<Binding ElementName="watermarkRoot" Path="RenderTransform" />
Expand Down Expand Up @@ -413,7 +414,22 @@
<Setter Property="BorderThickness" Value="2" />
<Style Selector="^ /template/ TextBlock#floatingWatermark">
<Setter Property="Foreground" Value="{DynamicResource MaterialPrimaryMidBrush}"/>
</Style>
</Style>
</Style>

<!-- Dense overrides -->
<Style Selector="^.dense">
<Setter Property="Padding" Value="10,2" />
</Style>
<Style Selector="^.dense /template/ Grid#PART_RootBorder">
<Setter Property="MinHeight" Value="36" />
</Style>
<Style Selector="^.dense[SelectedIndex=-1]:not(:focus-within) /template/ Border#watermarkRoot">
<Setter Property="Margin" Value="6,8,6,0" />
</Style>
<Style Selector="^.dense:focus-within /template/ TextBlock#floatingWatermark">
<Setter Property="Margin" Value="0,2"/>
</Style>

</ControlTheme>
</ResourceDictionary>