Commit e4e06cb
msftbot[bot]
Updated TabbedCommandBar for WinUI 2.6 (#4132)
## Fixes #4085
Previously, `TabbedCommandBar` used the system XAML `NavigationView`, but this doesn't work on WinUI 3. This PR makes the control functional on WinUI 2.6+ and 3.x, albeit with a few style issues (which will be fixed either in this PR or a later one).
## PR Type
What kind of change does this PR introduce?
Bugfix
Refactoring (no functional changes, no api changes)
## What is the current behavior?
See #4085
## What is the new behavior?
- `TabbedCommandBar` now inherits from MUXC `NavigationView` and uses 2.6 styles
- `Normal*` and `ContextualTabTemplate` now use MUXC `NavigationViewItem`
## PR Checklist
Please check if your PR fulfills the following requirements:
- [ ] Tested code with current [supported SDKs](../readme.md#supported)
- [ ] Tests for the changes have been added (for bug fixes / features) (if applicable)
- [x] Contains **NO** breaking changesFile tree
5 files changed
+454
-382
lines changed- Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TabbedCommandBar
- Microsoft.Toolkit.Uwp.UI.Controls.Core/TabbedCommandBar
5 files changed
+454
-382
lines changedLines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
18 | 21 | | |
19 | 22 | | |
20 | 23 | | |
| |||
Lines changed: 13 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | 9 | | |
| 10 | + | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| |||
36 | 37 | | |
37 | 38 | | |
38 | 39 | | |
| 40 | + | |
39 | 41 | | |
40 | 42 | | |
| 43 | + | |
41 | 44 | | |
42 | 45 | | |
43 | 46 | | |
| |||
55 | 58 | | |
56 | 59 | | |
57 | 60 | | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
58 | 70 | | |
59 | 71 | | |
60 | 72 | | |
| |||
0 commit comments