Commit 1dac6da
committed
Merge branch 'main' into winui
# Conflicts:
# CommunityToolkit.WinUI.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.cs
# CommunityToolkit.WinUI.UI.Controls.Core/TabbedCommandBar/TabbedCommandBar.xaml
# CommunityToolkit.WinUI.UI.Controls.Core/TabbedCommandBar/TabbedCommandBarItem.xamlFile tree
5 files changed
+460
-390
lines changed- CommunityToolkit.WinUI.SampleApp/SamplePages/TabbedCommandBar
- CommunityToolkit.WinUI.UI.Controls.Core/TabbedCommandBar
5 files changed
+460
-390
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 | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
11 | 10 | | |
| 11 | + | |
| 12 | + | |
12 | 13 | | |
13 | 14 | | |
14 | 15 | | |
| |||
37 | 38 | | |
38 | 39 | | |
39 | 40 | | |
| 41 | + | |
40 | 42 | | |
41 | 43 | | |
42 | 44 | | |
43 | 45 | | |
44 | 46 | | |
| 47 | + | |
45 | 48 | | |
46 | 49 | | |
47 | 50 | | |
| |||
59 | 62 | | |
60 | 63 | | |
61 | 64 | | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
62 | 74 | | |
63 | 75 | | |
64 | 76 | | |
| |||
0 commit comments