Skip to content

Fixed build errors when building Wasm with WinUI 3 #112

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

Merged
Arlodotexe merged 1 commit into from
Jul 25, 2023
Merged

Fixed build errors when building Wasm with WinUI 3 #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CommunityToolkit.App.Shared/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public App()
/// <param name="e">Details about the launch request and process.</param>
protected override void OnLaunched(LaunchActivatedEventArgs e)
{
#if WINAPPSDK
#if WINDOWS_WINAPPSDK
currentWindow = new Window();
currentWindow.Title = "Toolkit Labs Gallery";
currentWindow.AppWindow.SetIcon("Assets/Icon.ico");
Expand Down
2 changes: 1 addition & 1 deletion CommunityToolkit.App.Shared/Controls/TitleBar/NativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if WINAPPSDK
#if WINDOWS_WINAPPSDK
using System.Runtime.InteropServices;
using WinRT.Interop;
using Microsoft.UI;
Expand Down
2 changes: 1 addition & 1 deletion CommunityToolkit.App.Shared/Controls/TitleBar/TitleBar.WASDK.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if WINAPPSDK
#if WINDOWS_WINAPPSDK
using Microsoft.UI;
using Microsoft.UI.Windowing;

Expand Down
8 changes: 4 additions & 4 deletions CommunityToolkit.App.Shared/Controls/TitleBar/TitleBar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private void TitleBar_SizeChanged(object sender, SizeChangedEventArgs e)
VisualStateManager.GoToState(this, WideState, true);
}

#if WINAPPSDK
#if WINDOWS_WINAPPSDK
SetDragRegionForCustomTitleBar();
#endif
}
Expand All @@ -129,7 +129,7 @@ private void Configure()
#if WINDOWS_UWP && !HAS_UNO
SetUWPTitleBar();
#endif
#if WINAPPSDK
#if WINDOWS_WINAPPSDK
SetWASDKTitleBar();
#endif
}
Expand All @@ -139,7 +139,7 @@ public void Reset()
#if WINDOWS_UWP && !HAS_UNO
ResetUWPTitleBar();
#endif
#if WINAPPSDK
#if WINDOWS_WINAPPSDK
ResetWASDKTitleBar();
#endif
}
Expand Down Expand Up @@ -185,7 +185,7 @@ private void Update()
VisualStateManager.GoToState(this, FooterCollapsedState, true);
}

#if WINAPPSDK
#if WINDOWS_WINAPPSDK
SetDragRegionForCustomTitleBar();
#endif
}
Expand Down