Skip to content

Commit 5be5ec5

Browse files
l1pton17l1pton17
committed
Remove border from non editable combobox
1 parent dc14a8d commit 5be5ec5

File tree

1 file changed

+43
-47
lines changed

1 file changed

+43
-47
lines changed

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

Lines changed: 43 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -314,32 +314,30 @@
314314
<Grid Grid.Row="0" Margin="16.5 16 0 8">
315315
<Grid Height="21">
316316
<Border BorderBrush="{TemplateBinding BorderBrush}"
317-
BorderThickness="{TemplateBinding BorderThickness}">
318-
<Grid>
319-
<TextBox x:Name="EditableTextBoxClone"
320-
Visibility="{Binding ElementName=PART_EditableTextBox, Path=Visibility}"
321-
Text="{Binding ElementName=PART_EditableTextBox, Path=Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
322-
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
323-
IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
324-
Style="{StaticResource MaterialDesignComboBoxEditableTextBox}"
325-
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
326-
<ContentPresenter ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
327-
Visibility="{Binding ElementName=contentPresenter, Path=Visibility}"
328-
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
329-
Content="{TemplateBinding SelectionBoxItem}"
330-
ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
331-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
332-
IsHitTestVisible="False"
333-
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
334-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
335-
<TextBlock HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
336-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
337-
Opacity="{Binding Path=(wpf:TextFieldAssist.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}"
338-
IsHitTestVisible="False"
339-
Text="{TemplateBinding wpf:TextFieldAssist.Hint}"
340-
Visibility="{TemplateBinding Text, Converter={StaticResource TextFieldHintVisibilityConverter}}" />
341-
</Grid>
317+
BorderThickness="{TemplateBinding BorderThickness}"
318+
Visibility="{Binding ElementName=PART_EditableTextBox, Path=Visibility}">
319+
<TextBox x:Name="EditableTextBoxClone"
320+
Text="{Binding ElementName=PART_EditableTextBox, Path=Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
321+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
322+
IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
323+
Style="{StaticResource MaterialDesignComboBoxEditableTextBox}"
324+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
342325
</Border>
326+
<ContentPresenter ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
327+
Visibility="{Binding ElementName=contentPresenter, Path=Visibility}"
328+
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
329+
Content="{TemplateBinding SelectionBoxItem}"
330+
ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
331+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
332+
IsHitTestVisible="False"
333+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
334+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
335+
<TextBlock HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
336+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
337+
Opacity="{Binding Path=(wpf:TextFieldAssist.HintOpacity), RelativeSource={RelativeSource TemplatedParent}}"
338+
IsHitTestVisible="False"
339+
Text="{TemplateBinding wpf:TextFieldAssist.Hint}"
340+
Visibility="{TemplateBinding Text, Converter={StaticResource TextFieldHintVisibilityConverter}}" />
343341
<wpf:Underline IsActive="{Binding ElementName=EditableTextBoxClone, Path=IsKeyboardFocused}"
344342
Visibility="{Binding ElementName=Underline, Path=Visibility}"
345343
SnapsToDevicePixels="True"/>
@@ -522,29 +520,27 @@
522520
<Grid Height="24"
523521
Margin="0 -1 0 0">
524522
<Grid>
523+
<ContentPresenter ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
524+
Visibility="{Binding ElementName=contentPresenter, Path=Visibility}"
525+
Margin="{TemplateBinding Padding}"
526+
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
527+
Content="{TemplateBinding SelectionBoxItem}"
528+
ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
529+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
530+
IsHitTestVisible="False"
531+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
532+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
525533
<Border BorderBrush="{TemplateBinding BorderBrush}"
526-
BorderThickness="{TemplateBinding BorderThickness}">
527-
<Grid>
528-
<ContentPresenter ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
529-
Visibility="{Binding ElementName=contentPresenter, Path=Visibility}"
530-
Margin="{TemplateBinding Padding}"
531-
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
532-
Content="{TemplateBinding SelectionBoxItem}"
533-
ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
534-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
535-
IsHitTestVisible="False"
536-
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
537-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
538-
<TextBox x:Name="EditableTextBoxClone"
539-
Visibility="{Binding ElementName=PART_EditableTextBox, Path=Visibility}"
540-
Margin="{TemplateBinding Padding}"
541-
Text="{Binding ElementName=PART_EditableTextBox, Path=Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
542-
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
543-
IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
544-
Style="{StaticResource MaterialDesignComboBoxEditableTextBox}"
545-
VerticalAlignment="Center"
546-
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
547-
</Grid>
534+
BorderThickness="{TemplateBinding BorderThickness}"
535+
Visibility="{Binding ElementName=PART_EditableTextBox, Path=Visibility}">
536+
<TextBox x:Name="EditableTextBoxClone"
537+
Margin="{TemplateBinding Padding}"
538+
Text="{Binding ElementName=PART_EditableTextBox, Path=Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
539+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
540+
IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
541+
Style="{StaticResource MaterialDesignComboBoxEditableTextBox}"
542+
VerticalAlignment="Center"
543+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
548544
</Border>
549545
<wpf:Underline IsActive="{Binding ElementName=EditableTextBoxClone, Path=IsKeyboardFocused}"
550546
Visibility="{Binding ElementName=Underline, Path=Visibility}"

0 commit comments

Comments
 (0)