Skip to content

Commit a1e045b

Browse files
committed
Replace custom animations with XamlToolkit.WinUI.Animations; Added async clipboard text; Update dependencies
Removed all custom animation/effect types under OpenNet.UI.Xaml.Media.Animations and switched XAML to use XamlToolkit.WinUI.Animations. Updated project files and NuGet packages to reference XamlToolkit.WinUI.Animations 0.4.0-alpha and related dependencies. Upgraded WinUIEssential.WinUI3 and Microsoft.Windows.SDK.BuildTools. Enhanced HttpDownloadDialog with clipboard preview and refactored related code. Added async clipboard text utility to Core::Utils::Misc.
1 parent 3548e77 commit a1e045b

24 files changed

Lines changed: 235 additions & 1238 deletions

OpenNet/App.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
x:Class="OpenNet.App"
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6-
xmlns:animations="using:OpenNet.UI.Xaml.Media.Animations"
6+
xmlns:animations="using:XamlToolkit.WinUI.Animations"
77
xmlns:local="using:OpenNet">
88
<Application.Resources>
99
<ResourceDictionary>

OpenNet/Core/Utils/Misc.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "pch.h"
22
#include "Misc.h"
3+
#include <winrt/Windows.ApplicationModel.DataTransfer.h>
34
#include <winrt/Windows.Globalization.h>
45
#include <winrt/Windows.System.UserProfile.h>
56

@@ -424,6 +425,13 @@ winrt::hstring Core::Utils::Misc::parseHtmlLinks(const winrt::hstring& rawText)
424425
return winrt::hstring{ result };
425426
}
426427

428+
winrt::Windows::Foundation::IAsyncOperation<winrt::hstring> Core::Utils::Misc::getCurrentClipboardText()
429+
{
430+
auto clipboardContent = winrt::Windows::ApplicationModel::DataTransfer::Clipboard::GetContent();
431+
auto text = co_await clipboardContent.GetTextAsync();
432+
co_return text;
433+
}
434+
427435
winrt::hstring Core::Utils::Misc::osName()
428436
{
429437
// Get Windows version info

OpenNet/Core/Utils/Misc.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ namespace Core::Utils::Misc
5959
};
6060

6161
winrt::hstring parseHtmlLinks(const winrt::hstring& rawText);
62+
winrt::Windows::Foundation::IAsyncOperation<winrt::hstring> getCurrentClipboardText();
6263

6364
winrt::hstring osName();
6465
winrt::hstring boostVersionString();

OpenNet/OpenNet.vcxproj

Lines changed: 18 additions & 58 deletions
Large diffs are not rendered by default.

OpenNet/OpenNet.vcxproj.filters

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,6 @@
179179
<Midl Include="UI\Xaml\View\Pages\SettingsPages\SettingsPage.idl">
180180
<Filter>UI\Xaml\View\Pages\SettingsPages</Filter>
181181
</Midl>
182-
<Midl Include="UI\Xaml\Media\Animations\Animations.idl">
183-
<Filter>UI\Xaml\Media\Animations</Filter>
184-
</Midl>
185-
<Midl Include="UI\Xaml\Media\Animations\EffectAnimations.idl">
186-
<Filter>UI\Xaml\Media\Animations</Filter>
187-
</Midl>
188182
<Midl Include="UI\Xaml\Media\Enums.idl">
189183
<Filter>UI\Xaml\Media</Filter>
190184
</Midl>

OpenNet/Styles/NavigationView.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ResourceDictionary
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:animations="using:OpenNet.UI.Xaml.Media.Animations"
5+
xmlns:animations="using:XamlToolkit.WinUI.Animations"
66
xmlns:helpers="using:OpenNet.Helpers"
77
xmlns:local="using:OpenNet">
88
<ResourceDictionary.ThemeDictionaries>

OpenNet/Themes/Generic.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ResourceDictionary
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:anim="using:OpenNet.UI.Xaml.Media.Animations"
4+
xmlns:anim="using:XamlToolkit.WinUI.Animations"
55
xmlns:helpers="using:OpenNet.Helpers"
66
xmlns:local="using:OpenNet">
77

OpenNet/UI/Xaml/Media/Animations/Animations.idl

Lines changed: 0 additions & 52 deletions
This file was deleted.

OpenNet/UI/Xaml/Media/Animations/EffectAnimationTypes.cpp

Lines changed: 0 additions & 211 deletions
This file was deleted.

0 commit comments

Comments
 (0)