Skip to content

Commit

Permalink
Merge pull request #4057 from MahApps/fix/GH-4015
Browse files Browse the repository at this point in the history 
Fix FloatingWatermark position when using Left value for TextBoxHelper.ButtonsAlignment
  • Loading branch information
@punker76
punker76 authored Feb 28, 2021
2 parents 3c20e3f + c151e8a commit 7171d3a
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/MahApps.Metro/Styles/Controls.TextBox.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
<Setter TargetName="ButtonColumn" Property="Width" Value="*" />
<Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
<Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="1" />
<Setter TargetName="PART_FloatingMessageContainer" Property="Grid.Column" Value="1" />
<Setter TargetName="PART_Message" Property="Grid.Column" Value="1" />
<Setter TargetName="TextColumn" Property="Width" Value="Auto" />
</DataTrigger>
Expand Down Expand Up @@ -389,6 +390,7 @@
<Setter TargetName="ButtonColumn" Property="Width" Value="*" />
<Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
<Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="1" />
<Setter TargetName="PART_FloatingMessageContainer" Property="Grid.Column" Value="1" />
<Setter TargetName="PART_Message" Property="Grid.Column" Value="1" />
<Setter TargetName="TextColumn" Property="Width" Value="Auto" />
</DataTrigger>
Expand Down Expand Up @@ -677,6 +679,7 @@
<Setter TargetName="ButtonColumn" Property="Width" Value="*" />
<Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
<Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="1" />
<Setter TargetName="PART_FloatingMessageContainer" Property="Grid.Column" Value="1" />
<Setter TargetName="PART_Message" Property="Grid.Column" Value="1" />
<Setter TargetName="TextColumn" Property="Width" Value="Auto" />
</DataTrigger>
Expand Down Expand Up @@ -890,6 +893,7 @@
<Setter TargetName="ButtonColumn" Property="Width" Value="*" />
<Setter TargetName="PART_ClearText" Property="Grid.Column" Value="0" />
<Setter TargetName="PART_ContentHost" Property="Grid.Column" Value="1" />
<Setter TargetName="PART_FloatingMessageContainer" Property="Grid.Column" Value="1" />
<Setter TargetName="PART_Message" Property="Grid.Column" Value="1" />
<Setter TargetName="TextColumn" Property="Width" Value="Auto" />
</DataTrigger>
Expand Down

0 comments on commit 7171d3a

Please sign in to comment.