Skip to content

Commit bfc77df

Browse files
authored
add "PasswordBox" support "ButtonsAlignment"
add "MetroButtonPasswordBox" support "TextBoxHelper.ButtonsAlignment"
1 parent 7466641 commit bfc77df

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

src/MahApps.Metro/MahApps.Metro/Styles/Controls.PasswordBox.xaml

+17-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@
369369
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
370370
<Grid x:Name="PART_InnerGrid" Margin="2">
371371
<Grid.ColumnDefinitions>
372-
<ColumnDefinition Width="*" />
372+
<ColumnDefinition Width="Auto" />
373373
<ColumnDefinition Width="Auto" />
374374
<ColumnDefinition x:Name="ButtonColumn" Width="Auto" />
375375
</Grid.ColumnDefinitions>
@@ -450,6 +450,13 @@
450450
Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.DisabledVisualElementVisibility), Mode=OneWay}" />
451451
</Grid>
452452
<ControlTemplate.Triggers>
453+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Left">
454+
<Setter TargetName="ButtonColumn" Property="Width" Value="*" />
455+
<Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
456+
<Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="1" />
457+
<Setter TargetName="PART_Message" Property="Grid.Column" Value="1" />
458+
</DataTrigger>
459+
453460
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Password, Mode=OneWay}" Value="">
454461
<Setter TargetName="PART_Message" Property="Visibility" Value="Visible" />
455462
</DataTrigger>
@@ -468,6 +475,15 @@
468475
</MultiDataTrigger.ExitActions>
469476
</MultiDataTrigger>
470477

478+
<MultiDataTrigger>
479+
<MultiDataTrigger.Conditions>
480+
<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.ButtonsAlignment)}" Value="Right" />
481+
<Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(Controls:TextBoxHelper.TextButton)}" Value="False" />
482+
</MultiDataTrigger.Conditions>
483+
<Setter TargetName="PART_ContentHost" Property="Grid.ColumnSpan" Value="2" />
484+
<Setter TargetName="PART_Message" Property="Grid.ColumnSpan" Value="2" />
485+
</MultiDataTrigger>
486+
471487
<Trigger Property="IsMouseOver" Value="True">
472488
<Setter TargetName="Base" Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(Controls:ControlsHelper.MouseOverBorderBrush)}" />
473489
</Trigger>

0 commit comments

Comments
 (0)