Skip to content

Commit

Permalink
Fixes #593 by respecting Selectable correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
batzen committed Aug 8, 2018
1 parent c4cc055 commit afd8e2f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
- [#581](../../issues/581) - StackOverflow Exception when trying to access ApplicationMenu while RibbonMenu is minimized
- [#586](../../issues/586) - BackstageTabItem IsEnabled=False still displays content
- [#587](../../issues/587) - DisplayMemberPath no longer working on DropDownButton/MenuItem as of version 6.0
- [#593](../../issues/593) - Disable state selected in InRibbonGallery after click
- [#594](../../issues/594) - Keep title in the same location when opening the backstage
- [#602](../../issues/602) - Pin button not clickable when Ribbon in collapsed state

Expand Down
3 changes: 2 additions & 1 deletion Fluent.Ribbon.Showcase/TestContent.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -1915,7 +1915,8 @@ Pellentesque nec dolor sed lacus tristique rutrum sed vitae urna. Sed eu pharetr
ItemHeight="56"
ItemsSource="{Binding DataItems}"
ItemTemplate="{DynamicResource largeDataItemTemplate}"
ResizeMode="Both">
ResizeMode="Both"
Selectable="False">
<!--You can also add items to context menu-->
<Fluent:InRibbonGallery.Menu>
<Fluent:RibbonMenu>
Expand Down
2 changes: 1 addition & 1 deletion Fluent.Ribbon/Controls/InRibbonGallery.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,7 @@ protected override void OnSelectionChanged(SelectionChangedEventArgs e)
{
if (this.ItemContainerGenerator.ContainerFromItem(item) is GalleryItem itemContainer)
{
itemContainer.IsSelected = true;
itemContainer.IsSelected = this.Selectable;
}
}

Expand Down

0 comments on commit afd8e2f

Please sign in to comment.