Skip to content

Commit

Permalink
Moving minimize button to the right for #948
Browse files Browse the repository at this point in the history
  • Loading branch information
batzen committed Jul 13, 2021
1 parent 976f2d0 commit 05cfdd7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
- [#870](../../issues/870) - Add .NET 5 and .NET Core 3.1 and remove .NET Core 3.0
Support for .NET Core 3.0 was removed and support for .NET Core 3.1 and .NET 5.0 was added
- Increasing ControlzEx dependency version to >= 5
- [#948](../../issues/948) - Minimize button misplaced
Minimize button is moved to the right hand side of it's parent container.
That means custom toolbar items are not moving the button further left anymore.

**The following resources were added, renamed or removed ("---" indicates added when in column "Old" and removed when in column "New"):**

Expand Down
8 changes: 4 additions & 4 deletions Fluent.Ribbon/Themes/Controls/RibbonTabControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,10 @@
Grid.Column="3"
Orientation="Horizontal"
Margin="0,0,0,1">
<StackPanel x:Name="PART_ToolbarPanel"
Visibility="{Binding IsToolBarVisible, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
Orientation="Horizontal" />

<Fluent:ToggleButton x:Name="PART_MinimizeButton"
Margin="0"
Width="22"
Expand All @@ -291,10 +295,6 @@
Style="{DynamicResource Fluent.Ribbon.Styles.RibbonTabControl.MinimizeToggleButton}"
IsChecked="{Binding Path=IsMinimized, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
Visibility="{TemplateBinding CanMinimize, Converter={StaticResource boolToVisibilityConverter}}" />

<StackPanel x:Name="PART_ToolbarPanel"
Visibility="{Binding IsToolBarVisible, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
Orientation="Horizontal" />
</StackPanel>
</Grid>

Expand Down

0 comments on commit 05cfdd7

Please sign in to comment.