Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated TabbedCommandBar for WinUI 2.6 #4132

Merged
11 commits merged into from
Jul 30, 2021
Merged

Updated TabbedCommandBar for WinUI 2.6 #4132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
58dda08
Switched to WinUI NavView, template broken
yoshiask Jul 23, 2021
f86357a
Update TabbedCommandBar DefaultStyleResourceUri to point to Toolkit v…
michael-hawker Jul 23, 2021
c43aaee
Move SelectedItem setting for TabbedCommandBar to mitigate binding ti…
michael-hawker Jul 23, 2021
7bcf51f
Apply XAML Styler
michael-hawker Jul 27, 2021
f66d31c
Fix default Settings/Back Button Visibility and add support for AutoS…
michael-hawker Jul 27, 2021
881fb72
Tweaks to TabbedCommandBar to make it work better with WinUI 2.6
michael-hawker Jul 27, 2021
a5632a9
Remove Nested Grid to simplify template and Remove extra Visual States
michael-hawker Jul 28, 2021
5eb5717
Fix VisualState that was crashing, had a reference to unused element
michael-hawker Jul 28, 2021
609442b
Update CommandBar to use WinUI 2.6 style over reveal, looks nice!
michael-hawker Jul 28, 2021
a66b6d0
Remove old TODO
michael-hawker Jul 28, 2021
ebcdf29
Merge branch 'main' into fix_tcb_winui2.6
michael-hawker Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabbedCommandBar/TabbedCommandBar.bind
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
<RowDefinition/>
</Grid.RowDefinitions>

<controls:TabbedCommandBar>
<controls:TabbedCommandBar> <!-- IsBackButtonVisible="Visible" -->
<controls:TabbedCommandBar.AutoSuggestBox>
<AutoSuggestBox QueryIcon="Find" AutomationProperties.Name="Search" />
</controls:TabbedCommandBar.AutoSuggestBox>
<controls:TabbedCommandBar.PaneFooter>
<CommandBar Background="Transparent" DefaultLabelPosition="Right">
<AppBarButton Label="Share" Icon="Share"/>
Expand Down
14 changes: 13 additions & 1 deletion Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Markup;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Animation;
using NavigationView = Microsoft.UI.Xaml.Controls.NavigationView;
using NavigationViewSelectionChangedEventArgs = Microsoft.UI.Xaml.Controls.NavigationViewSelectionChangedEventArgs;

namespace Microsoft.Toolkit.Uwp.UI.Controls
{
Expand Down Expand Up @@ -36,8 +37,10 @@ public class TabbedCommandBar : NavigationView
public TabbedCommandBar()
{
DefaultStyleKey = typeof(TabbedCommandBar);
DefaultStyleResourceUri = new System.Uri("ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tried to remove the need for this line of code, but was unsuccessful

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, we had this same issue with ColorPicker as well. We have an issue on WinUI for this here: microsoft/microsoft-ui-xaml#3502 - I suppose we could link to it, but I think we need it on all controls for WinUI 3, right @azchohfi?


SelectionChanged += SelectedItemChanged;
Loaded += TabbedCommandBar_Loaded;
}

/// <inheritdoc/>
Expand All @@ -55,6 +58,15 @@ protected override void OnApplyTemplate()
_tabbedCommandBarContentBorder = GetTemplateChild("PART_TabbedCommandBarContentBorder") as Border;
_tabChangedStoryboard = GetTemplateChild("TabChangedStoryboard") as Storyboard;

// TODO: We could maybe optimize and use a lower-level Loaded event for what's hosting the MenuItems
// to set SelectedItem, but then we may have to pull in another template part, so think we're OK
// to do the Loaded event at the top level.
}

private void TabbedCommandBar_Loaded(object sender, RoutedEventArgs e)
{
// We need to select the item after the template is realized, otherwise the SelectedItem's
// DataTemplate bindings don't properly navigate the visual tree.
SelectedItem = MenuItems.FirstOrDefault();
}

Expand Down
Loading