Skip to content

Commit

Permalink
Fixes #291 by not setting MouseLeftButtonDown to handled
Browse files Browse the repository at this point in the history 
Also improves interaction with MVVM styled development in Backstage, BackstageTabControl and BackstageTabItem
  • Loading branch information
@batzen
batzen committed Apr 3, 2016
1 parent dc96c47 commit 88b9c71
Show file tree
Hide file tree
Showing 5 changed files with 160 additions and 184 deletions.
1 change: 1 addition & 0 deletions Changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
- [#280](../../issues/280) - Keytips of the Ribbon overlay StartScreen
- [#284](../../issues/284) - Overriding width of button does not work as it should
- [#285](../../issues/285) - MaterialDesign DialogHost issue with FluentRibbon
- [#291](../../issues/291) - BackStageTabItem leftmousedown event not firing
- OpenBackstage command was not acting on the correct backstage in a multiple backstage scenario (thanks to @maurosampietro)

- ### Enhancements
Expand Down
3 changes: 2 additions & 1 deletion Fluent.Ribbon.Showcase/TestContent.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
CanAddToQuickAccessToolBar="False"
Click="HandleSaveAsClick" />
<Fluent:BackstageTabItem Header="TEST"
KeyTip="T"
Content="Hello">
<Fluent:BackstageTabItem.ContentTemplate>
<DataTemplate>
Expand Down Expand Up @@ -198,7 +199,7 @@
<Fluent:SeparatorTabItem Header="Separator" />

<Fluent:BackstageTabItem Header="Info"
KeyTip="E"
KeyTip="I"
IsEnabled="False">
<ScrollViewer>
<Grid Height="400"
Expand Down
7 changes: 7 additions & 0 deletions Fluent.Ribbon/Controls/Backstage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,13 @@ private void OnBackstageUnloaded(object sender, RoutedEventArgs e)
/// The event data reports that the left mouse button was pressed.</param>
protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
{
base.OnMouseLeftButtonDown(e);

if (ReferenceEquals(e.Source, this) == false)
{
return;
}

this.Click();
}

Expand Down
198 changes: 92 additions & 106 deletions Fluent.Ribbon/Controls/BackstageTabControl.cs
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
using System;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Input;
using System.Windows.Media;

namespace Fluent
namespace Fluent
{
using System;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Controls.Primitives;
using System.Windows.Media;
using Fluent.Internal;

/// <summary>
Expand All @@ -20,10 +18,10 @@ public class BackstageTabControl : Selector
#region Properties

// Dependency property key for SelectedContent
private static readonly DependencyPropertyKey SelectedContentPropertyKey = DependencyProperty.RegisterReadOnly("SelectedContent", typeof(object), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));
private static readonly DependencyPropertyKey SelectedContentPropertyKey = DependencyProperty.RegisterReadOnly(nameof(SelectedContent), typeof(object), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));

/// <summary>
/// Dependency property SelectedContent
/// Dependency property for <see cref="SelectedContent"/>
/// </summary>
public static readonly DependencyProperty SelectedContentProperty = SelectedContentPropertyKey.DependencyProperty;

Expand All @@ -44,38 +42,38 @@ internal set
}

/// <summary>
/// Dependency property ContentStringFormat
/// Dependency property for <see cref="ContentStringFormat"/>
/// </summary>
public static readonly DependencyProperty ContentStringFormatProperty = DependencyProperty.Register("ContentStringFormat", typeof(string), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));
public static readonly DependencyProperty ContentStringFormatProperty = DependencyProperty.Register(nameof(ContentStringFormat), typeof(string), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));

/// <summary>
/// Dependency property ContentTemplate
/// Dependency property for <see cref="ContentTemplate"/>
/// </summary>
public static readonly DependencyProperty ContentTemplateProperty = DependencyProperty.Register("ContentTemplate", typeof(DataTemplate), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));
public static readonly DependencyProperty ContentTemplateProperty = DependencyProperty.Register(nameof(ContentTemplate), typeof(DataTemplate), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));

/// <summary>
/// Dependency property ContentTemplateSelector
/// Dependency property for <see cref="ContentTemplateSelector"/>
/// </summary>
public static readonly DependencyProperty ContentTemplateSelectorProperty = DependencyProperty.Register("ContentTemplateSelector", typeof(DataTemplateSelector), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));
public static readonly DependencyProperty ContentTemplateSelectorProperty = DependencyProperty.Register(nameof(ContentTemplateSelector), typeof(DataTemplateSelector), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));

private static readonly DependencyPropertyKey SelectedContentStringFormatPropertyKey = DependencyProperty.RegisterReadOnly("SelectedContentStringFormat", typeof(string), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));
private static readonly DependencyPropertyKey SelectedContentStringFormatPropertyKey = DependencyProperty.RegisterReadOnly(nameof(SelectedContentStringFormat), typeof(string), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));

/// <summary>
/// Dependency property SelectedContentStringFormat
/// Dependency property for <see cref="SelectedContentStringFormat"/>
/// </summary>
public static readonly DependencyProperty SelectedContentStringFormatProperty = SelectedContentStringFormatPropertyKey.DependencyProperty;

private static readonly DependencyPropertyKey SelectedContentTemplatePropertyKey = DependencyProperty.RegisterReadOnly("SelectedContentTemplate", typeof(DataTemplate), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));
private static readonly DependencyPropertyKey SelectedContentTemplatePropertyKey = DependencyProperty.RegisterReadOnly(nameof(SelectedContentTemplate), typeof(DataTemplate), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));

/// <summary>
/// Dependency property SelectedContentTemplate
/// Dependency property for <see cref="SelectedContentTemplate"/>
/// </summary>
public static readonly DependencyProperty SelectedContentTemplateProperty = SelectedContentTemplatePropertyKey.DependencyProperty;

private static readonly DependencyPropertyKey SelectedContentTemplateSelectorPropertyKey = DependencyProperty.RegisterReadOnly("SelectedContentTemplateSelector", typeof(DataTemplateSelector), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));
private static readonly DependencyPropertyKey SelectedContentTemplateSelectorPropertyKey = DependencyProperty.RegisterReadOnly(nameof(SelectedContentTemplateSelector), typeof(DataTemplateSelector), typeof(BackstageTabControl), new FrameworkPropertyMetadata(null));

/// <summary>
/// Dependency property SelectedContentTemplateSelector
/// Dependency property for <see cref="SelectedContentTemplateSelector"/>
/// </summary>
public static readonly DependencyProperty SelectedContentTemplateSelectorProperty = SelectedContentTemplateSelectorPropertyKey.DependencyProperty;

Expand Down Expand Up @@ -183,11 +181,10 @@ public Brush ItemsPanelBackground
}

/// <summary>
/// Using a DependencyProperty as the backing store for Foreground.
/// This enables animation, styling, binding, etc...
/// Dependency property for <see cref="ItemsPanelBackground"/>
/// </summary>
public static DependencyProperty ItemsPanelBackgroundProperty =
DependencyProperty.Register("ItemsPanelBackground", typeof(Brush), typeof(BackstageTabControl));
DependencyProperty.Register(nameof(ItemsPanelBackground), typeof(Brush), typeof(BackstageTabControl));

#endregion

Expand Down Expand Up @@ -219,18 +216,6 @@ public Backstage ParentBackstage
static BackstageTabControl()
{
DefaultStyleKeyProperty.OverrideMetadata(typeof(BackstageTabControl), new FrameworkPropertyMetadata(typeof(BackstageTabControl)));
StyleProperty.OverrideMetadata(typeof(BackstageTabControl), new FrameworkPropertyMetadata(null, OnCoerceStyle));
}

// Coerce object style
private static object OnCoerceStyle(DependencyObject d, object basevalue)
{
if (basevalue == null)
{
basevalue = (d as FrameworkElement).TryFindResource(typeof(BackstageTabControl));
}

return basevalue;
}

/// <summary>
Expand Down Expand Up @@ -274,6 +259,7 @@ private void HandleUnloaded(object sender, RoutedEventArgs e)
protected override void OnInitialized(EventArgs e)
{
base.OnInitialized(e);

this.ItemContainerGenerator.StatusChanged += this.OnGeneratorStatusChanged;
}

Expand Down Expand Up @@ -307,7 +293,8 @@ protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
{
base.OnItemsChanged(e);

if ((e.Action == NotifyCollectionChangedAction.Remove) && (this.SelectedIndex == -1))
if (e.Action == NotifyCollectionChangedAction.Remove
&& this.SelectedIndex == -1)
{
var startIndex = e.OldStartingIndex + 1;
if (startIndex > this.Items.Count)
Expand All @@ -330,70 +317,62 @@ protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
protected override void OnSelectionChanged(SelectionChangedEventArgs e)
{
base.OnSelectionChanged(e);

if (e.AddedItems.Count > 0)
{
this.UpdateSelectedContent();
}
e.Handled = true;
}

/// <summary>
/// Invoked when an unhandled MouseLeftButtonDown routed event
/// is raised on this element. Implement this method to add class handling for this event.
/// </summary>
/// <param name="e">The MouseButtonEventArgs that contains the event data.
/// The event data reports that the left mouse button was pressed</param>
protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
{
base.OnMouseLeftButtonDown(e);
e.Handled = true;
}

#endregion

#region Private methods

// Gets selected ribbon tab item
BackstageTabItem GetSelectedTabItem()
private BackstageTabItem GetSelectedTabItem()
{
object selectedItem = this.SelectedItem;
if (selectedItem == null)
{
return null;
}
BackstageTabItem item = selectedItem as BackstageTabItem;
if (item == null)
var container = this.ItemContainerGenerator.ContainerFromItem(this.SelectedItem) as BackstageTabItem;
if (container == null)
{
item = this.FindNextTabItem(this.SelectedIndex, 1);
this.SelectedItem = item;
container = this.FindNextTabItem(this.SelectedIndex, 1);
this.SelectedItem = this.ItemContainerGenerator.ItemFromContainer(container);
}
return item;

return container;
}

// Finds next tab item
private BackstageTabItem FindNextTabItem(int startIndex, int direction)
{
if (direction != 0)
if (direction == 0)
{
int index = startIndex;
for (int i = 0; i < this.Items.Count; i++)
return null;
}

var index = startIndex;
for (var i = 0; i < this.Items.Count; i++)
{
index += direction;

if (index >= this.Items.Count)
{
index += direction;
if (index >= this.Items.Count)
{
index = 0;
}
else if (index < 0)
{
index = this.Items.Count - 1;
}
BackstageTabItem item2 = this.ItemContainerGenerator.ContainerFromIndex(index) as BackstageTabItem;
if (((item2 != null) && item2.IsEnabled) && (item2.Visibility == Visibility.Visible))
{
return item2;
}
index = 0;
}
else if (index < 0)
{
index = this.Items.Count - 1;
}

var container = this.ItemContainerGenerator.ContainerFromIndex(index) as BackstageTabItem;

if (container != null
&& container.IsEnabled
&& container.Visibility == Visibility.Visible)
{
return container;
}
}

return null;
}

Expand All @@ -402,30 +381,33 @@ private void UpdateSelectedContent()
{
if (this.SelectedIndex < 0)
{

this.SelectedContent = null;
}
else
{
BackstageTabItem selectedTabItem = this.GetSelectedTabItem();
if (selectedTabItem != null)
var selectedTabItem = this.GetSelectedTabItem();
if (selectedTabItem == null)
{
return;
}

this.SelectedContent = selectedTabItem.Content;
if (selectedTabItem.ContentTemplate != null
|| selectedTabItem.ContentTemplateSelector != null
|| selectedTabItem.ContentStringFormat != null)
{
this.SelectedContent = selectedTabItem.Content;
if (((selectedTabItem.ContentTemplate != null) || (selectedTabItem.ContentTemplateSelector != null)) || (selectedTabItem.ContentStringFormat != null))
{
this.SelectedContentTemplate = selectedTabItem.ContentTemplate;
this.SelectedContentTemplateSelector = selectedTabItem.ContentTemplateSelector;
this.SelectedContentStringFormat = selectedTabItem.ContentStringFormat;
}
else
{
this.SelectedContentTemplate = this.ContentTemplate;
this.SelectedContentTemplateSelector = this.ContentTemplateSelector;
this.SelectedContentStringFormat = this.ContentStringFormat;
}

this.UpdateLayout();
this.SelectedContentTemplate = selectedTabItem.ContentTemplate;
this.SelectedContentTemplateSelector = selectedTabItem.ContentTemplateSelector;
this.SelectedContentStringFormat = selectedTabItem.ContentStringFormat;
}
else
{
this.SelectedContentTemplate = this.ContentTemplate;
this.SelectedContentTemplateSelector = this.ContentTemplateSelector;
this.SelectedContentStringFormat = this.ContentStringFormat;
}

this.UpdateLayout();
}
}

Expand All @@ -436,14 +418,18 @@ private void UpdateSelectedContent()
// Handles GeneratorStatusChange
private void OnGeneratorStatusChanged(object sender, EventArgs e)
{
if (this.ItemContainerGenerator.Status == GeneratorStatus.ContainersGenerated)
if (this.ItemContainerGenerator.Status != GeneratorStatus.ContainersGenerated)
{
if (this.HasItems && (this.SelectedIndex == -1))
{
this.SelectedIndex = 0;
}
this.UpdateSelectedContent();
return;
}

if (this.HasItems
&& this.SelectedIndex == -1)
{
this.SelectedIndex = 0;
}

this.UpdateSelectedContent();
}

#endregion
Expand Down
Loading

0 comments on commit 88b9c71

Please sign in to comment.