Skip to content

Commit 05e7ae7

Browse files
committed
Fix issue: modify the left margin of MultiSelectComboBox and TextBox Watermark (#222) 💯
1 parent dd24f9d commit 05e7ae7

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,6 @@
358358
</MultiTrigger.Conditions>
359359
<Setter TargetName="PART_RectangleSelected" Property="Visibility" Value="Collapsed" />
360360
<Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryBrush}" />
361-
<Setter TargetName="PART_ContentPresenter" Property="TextElement.FontWeight" Value="Bold" />
362361
</MultiTrigger>
363362
<MultiTrigger>
364363
<MultiTrigger.Conditions>
@@ -367,7 +366,6 @@
367366
</MultiTrigger.Conditions>
368367
<Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryBrush}" />
369368
<Setter TargetName="PART_RectangleSelected" Property="Visibility" Value="Visible" />
370-
<Setter TargetName="PART_ContentPresenter" Property="TextElement.FontWeight" Value="Bold" />
371369
</MultiTrigger>
372370
<Trigger Property="IsFocused" Value="True">
373371
<Setter TargetName="PART_RectangleMouseOver" Property="Opacity" Value=".2" />

src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
</MultiDataTrigger.Conditions>
7272
<MultiDataTrigger.Setters>
7373
<Setter Property="Background" Value="{DynamicResource WD.BaseBrush}" />
74-
<Setter TargetName="PART_Border" Property="TextElement.FontWeight" Value="Bold" />
7574
<Setter TargetName="PART_Border" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryBrush}" />
7675
</MultiDataTrigger.Setters>
7776
</MultiDataTrigger>
@@ -160,7 +159,8 @@
160159

161160
<TextBlock
162161
x:Name="PART_Watermark"
163-
Padding="{TemplateBinding Padding}"
162+
Margin="{TemplateBinding Padding}"
163+
Padding="1,0"
164164
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
165165
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
166166
Background="Transparent"

0 commit comments

Comments
 (0)