perf: 更多地方直接使用实现类型

src/Magpie/AboutViewModel.cpp

@@ -10,7 +10,6 @@
 #include "IconHelper.h"
 #include "CommonSharedConstants.h"
 
-using namespace ::Magpie;
 using namespace ::Magpie;
 using namespace winrt;
 using namespace Windows::UI::Xaml::Media::Imaging;

src/Magpie/App.cpp

@@ -38,7 +38,6 @@
 #include "IsNullStateTrigger.h"
 #include "TextBlockHelper.h"
 
-using namespace ::Magpie;
 using namespace ::Magpie;
 using namespace winrt;
 using namespace Windows::UI::ViewManagement;

src/Magpie/CandidateWindowItem.cpp

@@ -112,7 +112,7 @@ fire_and_forget CandidateWindowItem::_ResolveWindow(bool resolveIcon, bool resol
 			co_return;
 		}
 
-		App::Get().Dispatcher().TryRunAsync(
+		App::Get().Dispatcher().RunAsync(
 			CoreDispatcherPriority::Normal,
 			[this, defaultProfileName(std::move(defaultProfileName)), aumid(reader.AUMID())]() {
 				if (!defaultProfileName.empty()) {

src/Magpie/CaptionButtonsControl.h

@@ -3,6 +3,12 @@
 
 namespace winrt::Magpie::implementation {
 
+enum class CaptionButton {
+	Minimize = HTMINBUTTON,
+	Maximize = HTMAXBUTTON,
+	Close = HTCLOSE
+};
+
 struct CaptionButtonsControl : CaptionButtonsControlT<CaptionButtonsControl> {
 	Size CaptionButtonSize() const;
 

src/Magpie/CaptionButtonsControl.idl

@@ -1,22 +1,6 @@
 namespace Magpie {
-	enum CaptionButton {
-		Minimize = 8,   // HTMINBUTTON
-		Maximize = 9,   // HTMAXBUTTON
-		Close = 20      // HTCLOSE
-	};
-
+	[default_interface]
 	runtimeclass CaptionButtonsControl : Windows.UI.Xaml.Controls.UserControl {
 		CaptionButtonsControl();
-
-		Windows.Foundation.Size CaptionButtonSize { get; };
-
-		void HoverButton(CaptionButton button);
-		void PressButton(CaptionButton button);
-		void ReleaseButton(CaptionButton button);
-		void ReleaseButtons();
-		void LeaveButtons();
-
-		void IsWindowMaximized(Boolean value);
-		void IsWindowActive(Boolean value);
 	}
 }

src/Magpie/EffectParametersViewModel.cpp

@@ -15,6 +15,7 @@
 #include "ScalingMode.h"
 #include "EffectsService.h"
 #include "EffectDesc.h"
+#include "App.h"
 
 using namespace Magpie;
 
@@ -35,7 +36,6 @@ static fire_and_forget LazySaveAppSettings() {
 	}
 
 	sleeping = true;
-	CoreDispatcher dispatcher = CoreWindow::GetForCurrentThread().Dispatcher();
 
 	co_await 1s;
 
@@ -50,7 +50,7 @@ static fire_and_forget LazySaveAppSettings() {
 	}
 
 	// 回到主线程
-	co_await dispatcher;
+	co_await App::Get().Dispatcher();
 
 	sleeping = false;
 	AppSettings::Get().SaveAsync();

src/Magpie/FileDialogHelper.cpp

@@ -4,7 +4,7 @@
 #include "App.h"
 
 using namespace ::Magpie;
-using namespace winrt::Magpie;
+using namespace winrt::Magpie::implementation;
 using namespace winrt;
 
 namespace Magpie {
@@ -15,7 +15,7 @@ std::optional<std::wstring> FileDialogHelper::OpenFileDialog(IFileDialog* fileDi
 	fileDialog->GetOptions(&options1);
 	fileDialog->SetOptions(options1 | options | FOS_FORCEFILESYSTEM);
 
-	if (fileDialog->Show(implementation::App::Get().MainWindow().Handle()) != S_OK) {
+	if (fileDialog->Show(App::Get().MainWindow().Handle()) != S_OK) {
 		// 被用户取消
 		return std::wstring();
 	}

src/Magpie/HomePage.cpp

@@ -5,6 +5,7 @@
 #endif
 #include "XamlHelper.h"
 #include "ComboBoxHelper.h"
+#include "App.h"
 
 using namespace ::Magpie;
 
@@ -27,7 +28,7 @@ void HomePage::SimulateExclusiveFullscreenToggleSwitch_Toggled(IInspectable cons
 	}
 
 	// 这个回调被触发时 UI 还没有更新，需要异步处理
-	Dispatcher().RunAsync(CoreDispatcherPriority::Low, [weakThis(get_weak())]() {
+	App::Get().Dispatcher().RunAsync(CoreDispatcherPriority::Low, [weakThis(get_weak())]() {
 		auto strongThis = weakThis.get();
 		if (!strongThis) {
 			return;

src/Magpie/HomeViewModel.cpp

@@ -201,15 +201,14 @@ fire_and_forget HomeViewModel::IsTouchSupportEnabled(bool value) {
 	}
 
 	auto weakThis = get_weak();
-	CoreDispatcher dispatcher = CoreWindow::GetForCurrentThread().Dispatcher();
 
 	// UAC 可能导致 XAML Islands 崩溃，因此不能在主线程上执行 ShellExecute，
 	// 见 https://github.com/microsoft/microsoft-ui-xaml/issues/4952
 	co_await resume_background();
 
 	TouchHelper::IsTouchSupportEnabled(value);
 
-	co_await dispatcher;
+	co_await App::Get().Dispatcher();
 
 	if (weakThis.get()) {
 		RaisePropertyChanged(L"IsTouchSupportEnabled");

src/Magpie/MainWindow.cpp

@@ -428,7 +428,7 @@ LRESULT MainWindow::_TitleBarMessageHandler(UINT msg, WPARAM wParam, LPARAM lPar
 	[[fallthrough]];
 	case WM_NCMOUSEMOVE:
 	{
-		auto captionButtons = Content()->TitleBar().CaptionButtons();
+		CaptionButtonsControl& captionButtons = Content()->TitleBar().CaptionButtons();
 
 		// 将 hover 状态通知 CaptionButtons。标题栏窗口拦截了 XAML Islands 中的标题栏
 		// 控件的鼠标消息，标题栏按钮的状态由我们手动控制。
@@ -444,7 +444,7 @@ LRESULT MainWindow::_TitleBarMessageHandler(UINT msg, WPARAM wParam, LPARAM lPar
 		case HTMINBUTTON:
 		case HTMAXBUTTON:
 		case HTCLOSE:
-			captionButtons.HoverButton((winrt::Magpie::CaptionButton)wParam);
+			captionButtons.HoverButton((CaptionButton)wParam);
 
 			// 追踪鼠标以确保鼠标离开标题栏时我们能收到 WM_NCMOUSELEAVE 消息，否则无法
 			// 可靠的收到这个消息，尤其是在用户快速移动鼠标的时候。
@@ -502,7 +502,7 @@ LRESULT MainWindow::_TitleBarMessageHandler(UINT msg, WPARAM wParam, LPARAM lPar
 		case HTMINBUTTON:
 		case HTMAXBUTTON:
 		case HTCLOSE:
-			Content()->TitleBar().CaptionButtons().PressButton((winrt::Magpie::CaptionButton)wParam);
+			Content()->TitleBar().CaptionButtons().PressButton((CaptionButton)wParam);
 			// 在标题栏按钮上按下左键后我们便捕获光标，这样才能在释放时得到通知。注意捕获光标后
 			// 便不会再收到 NC 族消息，这就是为什么我们要处理 WM_MOUSEMOVE 和 WM_LBUTTONUP
 			SetCapture(_hwndTitleBar);
@@ -535,7 +535,7 @@ LRESULT MainWindow::_TitleBarMessageHandler(UINT msg, WPARAM wParam, LPARAM lPar
 		case HTMAXBUTTON:
 		case HTCLOSE:
 			// 在标题栏按钮上释放左键
-			Content()->TitleBar().CaptionButtons().ReleaseButton((winrt::Magpie::CaptionButton)wParam);
+			Content()->TitleBar().CaptionButtons().ReleaseButton((CaptionButton)wParam);
 			break;
 		default:
 			Content()->TitleBar().CaptionButtons().ReleaseButtons();
@@ -558,7 +558,7 @@ void MainWindow::_ResizeTitleBarWindow() noexcept {
 		return;
 	}
 
-	auto titleBar = Content()->TitleBar();
+	TitleBarControl& titleBar = Content()->TitleBar();
 
 	// 获取标题栏的边框矩形
 	winrt::Rect rect{0.0f, 0.0f, (float)titleBar.ActualWidth(), (float)titleBar.ActualHeight()};

src/Magpie/ProfileViewModel.cpp

@@ -18,7 +18,6 @@
 #include "CommonSharedConstants.h"
 #include "App.h"
 
-using namespace ::Magpie;
 using namespace ::Magpie;
 using namespace winrt;
 using namespace Windows::Graphics::Display;
@@ -758,7 +757,6 @@ fire_and_forget ProfileViewModel::_LoadIcon() {
 		const bool preferLightTheme = App::Get().IsLightTheme();
 		const bool isPackaged = _data->isPackaged;
 		const std::wstring path = _data->pathRule;
-		CoreDispatcher dispatcher = App::Get().Dispatcher();
 		const uint32_t iconSize =
 			(uint32_t)std::lroundf(32.0f * App::Get().MainWindow().CurrentDpi() / USER_DEFAULT_SCREEN_DPI);
 
@@ -780,7 +778,7 @@ fire_and_forget ProfileViewModel::_LoadIcon() {
 			iconBitmap = IconHelper::ExtractIconFromExe(path.c_str(), iconSize);
 		}
 
-		co_await dispatcher;
+		co_await App::Get().Dispatcher();
 		if (!weakThis.get()) {
 			co_return;
 		}

src/Magpie/RootPage.cpp

@@ -16,7 +16,6 @@
 #include "LocalizationService.h"
 #include "App.h"
 
-using namespace ::Magpie;
 using namespace ::Magpie;
 using namespace winrt;
 using namespace Windows::Graphics::Display;
@@ -241,7 +240,6 @@ fire_and_forget RootPage::_LoadIcon(MUXC::NavigationViewItem const& item, const
 	bool preferLightTheme = App::Get().IsLightTheme();
 	bool isPackaged = profile.isPackaged;
 	std::wstring path = profile.pathRule;
-	CoreDispatcher dispatcher = App::Get().Dispatcher();
 	const uint32_t iconSize = (uint32_t)std::lroundf(
 		16.0f * App::Get().MainWindow().CurrentDpi() / USER_DEFAULT_SCREEN_DPI);
 
@@ -265,7 +263,7 @@ fire_and_forget RootPage::_LoadIcon(MUXC::NavigationViewItem const& item, const
 		iconBitmap = IconHelper::ExtractIconFromExe(path.c_str(), iconSize);
 	}
 
-	co_await dispatcher;
+	co_await App::Get().Dispatcher();
 
 	auto strongRef = weakRef.get();
 	if (!strongRef) {

src/Magpie/RootPage.h

@@ -2,6 +2,7 @@
 #include "RootPage.g.h"
 #include "Event.h"
 #include "NewProfileViewModel.h"
+#include "TitleBarControl.h"
 
 namespace Magpie {
 struct Profile;
@@ -39,6 +40,10 @@ struct RootPage : RootPageT<RootPage> {
 
 	void NavigateToAboutPage();
 
+	TitleBarControl& TitleBar() {
+		return *get_self<TitleBarControl>(RootPageT::TitleBar());
+	}
+
 private:
 	void _UpdateTheme(bool updateIcons);
 

src/Magpie/ScalingModeEffectItem.cpp

@@ -1,5 +1,8 @@
 #include "pch.h"
 #include "ScalingModeEffectItem.h"
+#if __has_include("ScalingTypeItem.g.cpp")
+#include "ScalingTypeItem.g.cpp"
+#endif
 #if __has_include("ScalingModeEffectItem.g.cpp")
 #include "ScalingModeEffectItem.g.cpp"
 #endif
@@ -69,19 +72,19 @@ IVector<IInspectable> ScalingModeEffectItem::ScalingTypes() noexcept {
 		ResourceLoader::GetForCurrentView(CommonSharedConstants::APP_RESOURCE_MAP_ID);
 
 	return single_threaded_vector(std::vector<IInspectable>{
-		Magpie::ScalingType(
+		make<ScalingTypeItem>(
 			resourceLoader.GetString(L"ScalingModes_ScaleFlyout_Type_Factor"),
 			resourceLoader.GetString(L"ScalingModes_ScaleFlyout_Type_Factor_Description")
 		),
-		Magpie::ScalingType(
+		make<ScalingTypeItem>(
 			resourceLoader.GetString(L"ScalingModes_ScaleFlyout_Type_Fit"),
 			resourceLoader.GetString(L"ScalingModes_ScaleFlyout_Type_Fit_Description")
 		),
-		Magpie::ScalingType(
+		make<ScalingTypeItem>(
 			resourceLoader.GetString(L"ScalingModes_ScaleFlyout_Type_Absolute"),
 			resourceLoader.GetString(L"ScalingModes_ScaleFlyout_Type_Absolute_Description")
 		),
-		Magpie::ScalingType(
+		make<ScalingTypeItem>(
 			resourceLoader.GetString(L"ScalingModes_ScaleFlyout_Type_Fill"),
 			resourceLoader.GetString(L"ScalingModes_ScaleFlyout_Type_Fill_Description")
 		),
@@ -227,7 +230,7 @@ void ScalingModeEffectItem::ScalingPixelsY(double value) {
 }
 
 void ScalingModeEffectItem::Remove() {
-	Removed.invoke(*this, _effectIdx);
+	Removed.Invoke(_effectIdx);
 }
 
 bool ScalingModeEffectItem::CanMove() const noexcept {
@@ -245,11 +248,11 @@ bool ScalingModeEffectItem::CanMoveDown() const noexcept {
 }
 
 void ScalingModeEffectItem::MoveUp() noexcept {
-	Moved.invoke(*this, true);
+	Moved.Invoke(*this, true);
 }
 
 void ScalingModeEffectItem::MoveDown() noexcept {
-	Moved.invoke(*this, false);
+	Moved.Invoke(*this, false);
 }
 
 void ScalingModeEffectItem::RefreshMoveState() {

src/Magpie/ScalingModeEffectItem.h

@@ -1,17 +1,27 @@
 #pragma once
+#include "ScalingTypeItem.g.h"
 #include "ScalingModeEffectItem.g.h"
 #include "EffectParametersViewModel.h"
+#include "Event.h"
 
 namespace Magpie {
 struct EffectOption;
 }
 
-namespace Magpie {
-struct EffectInfo;
-}
-
 namespace winrt::Magpie::implementation {
 
+struct ScalingTypeItem : ScalingTypeItemT<ScalingTypeItem> {
+	ScalingTypeItem(hstring name, hstring desc) : _name(std::move(name)), _desc(std::move(desc)) {}
+
+	hstring Name() const noexcept { return _name; }
+
+	hstring Desc() const noexcept { return _desc; }
+
+private:
+	hstring _name;
+	hstring _desc;
+};
+
 struct ScalingModeEffectItem : ScalingModeEffectItemT<ScalingModeEffectItem>,
                                wil::notify_property_changed_base<ScalingModeEffectItem> {
 	ScalingModeEffectItem(uint32_t scalingModeIdx, uint32_t effectIdx);
@@ -71,8 +81,8 @@ struct ScalingModeEffectItem : ScalingModeEffectItemT<ScalingModeEffectItem>,
 	void RefreshMoveState();
 
 	// 上移为 true，下移为 false
-	wil::typed_event<Magpie::ScalingModeEffectItem, bool> Moved;
-	wil::untyped_event<uint32_t> Removed;
+	::Magpie::Event<ScalingModeEffectItem&, bool> Moved;
+	::Magpie::Event<uint32_t> Removed;
 
 private:
 	::Magpie::EffectOption& _Data() noexcept;

src/Magpie/ScalingModeEffectItem.idl

@@ -1,4 +1,9 @@
 namespace Magpie {
+	runtimeclass ScalingTypeItem {
+		String Name { get; };
+		String Desc { get; };
+	}
+
 	runtimeclass ScalingModeEffectItem : Windows.UI.Xaml.Data.INotifyPropertyChanged {
 		UInt32 ScalingModeIdx;
 		UInt32 EffectIdx;
@@ -19,14 +24,12 @@ namespace Magpie {
 		EffectParametersViewModel Parameters { get; };
 
 		void Remove();
-		event Windows.Foundation.EventHandler<UInt32> Removed;
 
 		Boolean CanMove { get; };
 		Boolean CanMoveUp { get; };
 		Boolean CanMoveDown { get; };
 		void MoveUp();
 		void MoveDown();
-		event Windows.Foundation.TypedEventHandler<ScalingModeEffectItem, Boolean> Moved;
 
 		void RefreshMoveState();
 	}