Skip to content

Fix BackGround of ComboBox #1748

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 4 commits into from
Apr 20, 2020
Merged

Fix BackGround of ComboBox #1748

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e667336
Fix #1728. Move CornerRadius Element.
soi013 Apr 14, 2020
090612b
fix BackGround of ComboBox
soi013 Apr 19, 2020
7153e78
Merge branch 'master' into fix_#1728
soi013 Apr 19, 2020
24d036c
fix conflict
soi013 Apr 19, 2020
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
31 changes: 19 additions & 12 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@
</Border.Effect>
</Border>
<Border Margin="1"
CornerRadius="{Binding Path=CornerRadius, RelativeSource={RelativeSource AncestorType=wpf:ComboBoxPopup}}"
Background="{Binding ElementName=PART_Popup, Path=Background}">
CornerRadius="{Binding Path=CornerRadius, RelativeSource={RelativeSource AncestorType=wpf:ComboBoxPopup}}" >
<Grid SnapsToDevicePixels="True">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
Expand All @@ -65,21 +64,21 @@
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" Height="{StaticResource PopupTopBottomMargin}"/>
<Border Grid.Row="0" Height="{StaticResource PopupTopBottomMargin}" Background="{Binding ElementName=PART_Popup, Path=Background}"/>
<ContentPresenter Grid.Row="1"/>
<Border Grid.Row="2" Height="{StaticResource PopupContentPresenterExtend}"/>
<Border Grid.Row="2" Height="{StaticResource PopupContentPresenterExtend}" Background="{Binding ElementName=PART_Popup, Path=Background}"/>

<Grid Grid.Row="3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0" Width="{StaticResource PopupLeftRightMargin}"/>
<Border Grid.Column="0" Width="{StaticResource PopupLeftRightMargin}" Background="{Binding ElementName=PART_Popup, Path=Background}"/>
<Grid Grid.Column="1"
Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type wpf:ComboBoxPopup}}, Path=VisiblePlacementWidth}"
Height="{Binding ElementName=templateRoot, Path=ActualHeight}"/>
<Border Grid.Column="2" MinWidth="{StaticResource PopupLeftRightMargin}"/>
<Border Grid.Column="2" MinWidth="{StaticResource PopupLeftRightMargin}" Background="{Binding ElementName=PART_Popup, Path=Background}"/>
</Grid>
<Border Grid.Row="4" Height="{StaticResource PopupTopBottomMargin}"/>
</Grid>
Expand All @@ -102,8 +101,7 @@
</Border.Effect>
</Border>
<Border Margin="1"
CornerRadius="{Binding Path=CornerRadius, RelativeSource={RelativeSource AncestorType=wpf:ComboBoxPopup}}"
Background="{Binding ElementName=PART_Popup, Path=Background}">
CornerRadius="{Binding Path=CornerRadius, RelativeSource={RelativeSource AncestorType=wpf:ComboBoxPopup}}">
<Grid SnapsToDevicePixels="True">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
Expand All @@ -113,28 +111,33 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Border Grid.Row="0"
Height="{StaticResource PopupTopBottomMargin}"/>
Height="{StaticResource PopupTopBottomMargin}"
Background="{Binding ElementName=PART_Popup, Path=Background}"/>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Border Grid.Column="0"
<Border Grid.Column="0"
Background="{Binding ElementName=PART_Popup, Path=Background}"
Width="{StaticResource PopupLeftRightMargin}"/>
<Grid Grid.Column="1"
Width="{Binding RelativeSource={RelativeSource AncestorType={x:Type wpf:ComboBoxPopup}}, Path=VisiblePlacementWidth}"
Height="{Binding ElementName=templateRoot, Path=ActualHeight}"/>
<Border Grid.Column="2"
Background="{Binding ElementName=PART_Popup, Path=Background}"
MinWidth="{StaticResource PopupLeftRightMargin}"/>
</Grid>

<Border Grid.Row="2"
Background="{Binding ElementName=PART_Popup, Path=Background}"
Height="{StaticResource PopupContentPresenterExtend}"/>

<ContentPresenter Grid.Row="3"/>

<Border Grid.Row="4"
Background="{Binding ElementName=PART_Popup, Path=Background}"
Height="{StaticResource PopupTopBottomMargin}" />
</Grid>
</Border>
Expand Down Expand Up @@ -164,9 +167,13 @@
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Border Grid.Row="0" Height="{StaticResource PopupTopBottomMargin}"/>
<Border Grid.Row="0"
Height="{StaticResource PopupTopBottomMargin}"
Background="{Binding ElementName=PART_Popup, Path=Background}" />
<ContentPresenter Grid.Row="1"/>
<Border Grid.Row="2" Height="{StaticResource PopupTopBottomMargin}" />
<Border Grid.Row="2"
Height="{StaticResource PopupTopBottomMargin}"
Background="{Binding ElementName=PART_Popup, Path=Background}" />
</Grid>
</Border>
</Grid>
Expand Down