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

Jump to bottom

[pull] master from unoplatform:master #146

Closed
wants to merge 21 commits into from
Closed

[pull] master from unoplatform:master #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1a2bc9c
chore: align SplitButton and ToggleSplitButton with WinUI 3
ramezgerges Nov 14, 2023
a1aa06f
chore: port interaction tests for SplitButton
ramezgerges Nov 15, 2023
d5dab5b
chore: build errors
ramezgerges Nov 20, 2023
1535952
chore: formatting
ramezgerges Dec 25, 2023
9cd268a
chore: add "alt" in KeyboardHelper keys
ramezgerges Dec 25, 2023
4d00c81
chore: build errors
ramezgerges Dec 25, 2023
ed3d300
fix(popup): add a workaround to make popup focusable despite being no…
ramezgerges Dec 26, 2023
00bed23
chore: Adjust split button build
jeromelaban Feb 7, 2024
74272dd
chore: Ensure we don't crash when MainPage does not use SampleChooser
MartinZikmund Feb 15, 2024
72f03e2
fix: Ensure NavigationStarting is executed reliably on Android
MartinZikmund Feb 15, 2024
0f26267
chore: Ensure NavigationStarting occurs on non-programmatic navigations
MartinZikmund Feb 15, 2024
52260ac
test: Verify NavigationStarting is called
MartinZikmund Feb 15, 2024
7f79610
chore: Explain the new behavior
MartinZikmund Feb 15, 2024
82931bd
chore: updates for default includes
dansiegel Feb 15, 2024
64fc934
Merge pull request #15491 from unoplatform/dev/ds/sdk-default-items
jeromelaban Feb 15, 2024
941e81f
fix: issue with libraries not getting correct resource path
dansiegel Feb 15, 2024
7da9fb5
Merge pull request #15487 from unoplatform/dev/mazi/webview-adjust
jeromelaban Feb 15, 2024
dd35b12
fix: Specify root mode for root assembly
ebariche Feb 15, 2024
013859c
Merge pull request #15497 from unoplatform/dev/ds/core-mrt-tooling
dansiegel Feb 16, 2024
83c83ce
Merge pull request #15503 from unoplatform/dev/eb/xaml-trimming
jeromelaban Feb 16, 2024
42f614e
Merge pull request #14440 from ramezgerges/splitbutton_align_winui
jeromelaban Feb 16, 2024
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
4 changes: 2 additions & 2 deletions src/SamplesApp/SamplesApp.Shared/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ override void OnLaunched(LaunchActivatedEventArgs e)

HandleLaunchArguments(e);

if (SampleControl.Presentation.SampleChooserViewModel.Instance.CurrentSelectedSample is null)
if (SampleControl.Presentation.SampleChooserViewModel.Instance is { } vm && vm.CurrentSelectedSample is null)
{
SampleControl.Presentation.SampleChooserViewModel.Instance.SetSelectedSample(CancellationToken.None, "Playground", "Playground");
vm.SetSelectedSample(CancellationToken.None, "Playground", "Playground");
}

Console.WriteLine("Done loading " + sw.Elapsed);
Expand Down
51 changes: 0 additions & 51 deletions ...esApp/SamplesApp.UITests/Microsoft_UI_Xaml_Controls/SplitButtonTests/Given_SplitButton.cs
View file
Open in desktop

This file was deleted.

232 changes: 0 additions & 232 deletions ...amplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/SplitButtonTests/SplitButtonPage.xaml
View file
Open in desktop

This file was deleted.

Loading
Loading