feat: 优化 UI，更符合 Win11 风格

Blinue · Oct 5, 2022 · 2510715 · 2510715
1 parent 552bd94
commit 2510715
Show file tree

Hide file tree

Showing 19 changed files with 106 additions and 84 deletions.
diff --git a/src/Magpie.Core/CursorManager.cpp b/src/Magpie.Core/CursorManager.cpp
@@ -142,7 +142,7 @@ static std::optional<LRESULT> HostWndProc(HWND /*hWnd*/, UINT message, WPARAM /*
 			return 0;
 		}
 
-		if (!MagApp::Get().GetOptions().IsBreakpointMode()) {
+		if (!MagApp::Get().GetOptions().IsDebugMode()) {
 			SetWindowPos(MagApp::Get().GetHwndHost(), HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOREDRAW);
 		}
 	}
@@ -661,7 +661,7 @@ void CursorManager::_UpdateCursorClip() {
 
 	const RECT& srcFrameRect = MagApp::Get().GetFrameSource().GetSrcFrameRect();
 
-	if (!MagApp::Get().GetOptions().IsBreakpointMode() && MagApp::Get().GetOptions().Is3DGameMode()) {
+	if (!MagApp::Get().GetOptions().IsDebugMode() && MagApp::Get().GetOptions().Is3DGameMode()) {
 		// 开启“在 3D 游戏中限制光标”则每帧都限制一次光标
 		_curClips = srcFrameRect;
 		ClipCursor(&srcFrameRect);
@@ -828,7 +828,7 @@ void CursorManager::_UpdateCursorClip() {
 		}
 	}
 
-	if (MagApp::Get().GetOptions().IsBreakpointMode()) {
+	if (MagApp::Get().GetOptions().IsDebugMode()) {
 		return;
 	}
 

diff --git a/src/Magpie.Core/ImGuiImpl.cpp b/src/Magpie.Core/ImGuiImpl.cpp
@@ -174,7 +174,7 @@ bool ImGuiImpl::Initialize() {
 	}
 
 	// 断点模式下不注册鼠标钩子，否则调试时鼠标无法使用
-	if (!MagApp::Get().GetOptions().IsBreakpointMode() && !MagApp::Get().GetOptions().Is3DGameMode()) {
+	if (!MagApp::Get().GetOptions().IsDebugMode() && !MagApp::Get().GetOptions().Is3DGameMode()) {
 		_hHookThread = CreateThread(nullptr, 0, ThreadProc, nullptr, 0, &_hookThreadId);
 		if (!_hHookThread) {
 			Logger::Get().Win32Error("创建线程失败");

diff --git a/src/Magpie.Core/MagApp.cpp b/src/Magpie.Core/MagApp.cpp
@@ -119,7 +119,7 @@ bool MagApp::Run(HWND hwndSrc, MagOptions&& options, winrt::DispatcherQueue cons
 		return false;
 	}
 
-	if (_options.IsDisableDirectFlip() && !_options.IsBreakpointMode()) {
+	if (_options.IsDisableDirectFlip() && !_options.IsDebugMode()) {
 		// 在此处创建的 DDF 窗口不会立刻显示
 		if (!_DisableDirectFlip()) {
 			Logger::Get().Error("_DisableDirectFlip 失败");
@@ -303,7 +303,7 @@ bool MagApp::_CreateHostWnd() {
 	}
 
 	_hwndHost = CreateWindowEx(
-		(_options.IsBreakpointMode() ? 0 : WS_EX_TOPMOST) | WS_EX_NOACTIVATE | WS_EX_LAYERED | WS_EX_TRANSPARENT | WS_EX_TOOLWINDOW,
+		(_options.IsDebugMode() ? 0 : WS_EX_TOPMOST) | WS_EX_NOACTIVATE | WS_EX_LAYERED | WS_EX_TRANSPARENT | WS_EX_TOOLWINDOW,
 		HOST_WINDOW_CLASS_NAME,
 		NULL,	// 标题为空，否则会被添加新配置页面列为候选窗口
 		WS_POPUP,

diff --git a/src/Magpie.Core/MagOptions.h b/src/Magpie.Core/MagOptions.h
@@ -73,7 +73,7 @@ struct EffectOption {
 
 struct MagOptions {
 	DEFINE_FLAG_ACCESSOR(IsDisableWindowResizing, MagFlags::DisableWindowResizing, flags)
-	DEFINE_FLAG_ACCESSOR(IsBreakpointMode, MagFlags::BreakpointMode, flags)
+	DEFINE_FLAG_ACCESSOR(IsDebugMode, MagFlags::BreakpointMode, flags)
 	DEFINE_FLAG_ACCESSOR(IsDisableEffectCache, MagFlags::DisableEffectCache, flags)
 	DEFINE_FLAG_ACCESSOR(IsSaveEffectSources, MagFlags::SaveEffectSources, flags)
 	DEFINE_FLAG_ACCESSOR(IsWarningsAreErrors, MagFlags::WarningsAreErrors, flags)

diff --git a/src/Magpie.Core/Renderer.cpp b/src/Magpie.Core/Renderer.cpp
@@ -229,7 +229,7 @@ const EffectDesc& Renderer::GetEffectDesc(uint32_t idx) const noexcept {
 bool Renderer::_CheckSrcState() {
 	HWND hwndSrc = MagApp::Get().GetHwndSrc();
 
-	if (!MagApp::Get().GetOptions().IsBreakpointMode()) {
+	if (!MagApp::Get().GetOptions().IsDebugMode()) {
 		HWND hwndForeground = GetForegroundWindow();
 		// 在 3D 游戏模式下打开游戏内覆盖则全屏窗口可以接收焦点
 		if (!MagApp::Get().GetOptions().Is3DGameMode() || !IsUIVisiable() || hwndForeground != MagApp::Get().GetHwndHost()) {

diff --git a/src/Magpie.UI/AboutPage.xaml b/src/Magpie.UI/AboutPage.xaml
@@ -29,17 +29,11 @@
 					</muxc:Expander.Header>
 					<muxc:Expander.Content>
 						<StackPanel Orientation="Vertical">
-							<local:SettingItem Title="自动下载更新"
-											   Style="{StaticResource ExpanderContentSettingStyle}">
-								<local:SettingItem.ActionContent>
-									<ToggleSwitch />
-								</local:SettingItem.ActionContent>
+							<local:SettingItem Style="{StaticResource ExpanderContentSettingStyle}">
+								<CheckBox Content="自动下载更新" />
 							</local:SettingItem>
-							<local:SettingItem Title="检查预览版更新"
-											   Style="{StaticResource ExpanderContentSettingStyle}">
-								<local:SettingItem.ActionContent>
-									<ToggleSwitch />
-								</local:SettingItem.ActionContent>
+							<local:SettingItem Style="{StaticResource ExpanderContentSettingStyle}">
+								<CheckBox Content="检查预览版更新" />
 							</local:SettingItem>
 						</StackPanel>
 					</muxc:Expander.Content>

diff --git a/src/Magpie.UI/AppSettings.cpp b/src/Magpie.UI/AppSettings.cpp
@@ -498,8 +498,8 @@ bool AppSettings::Save() {
 	writer.Bool(_isAutoRestore);
 	writer.Key("downCount");
 	writer.Uint(_downCount);
-	writer.Key("breakpointMode");
-	writer.Bool(_isBreakpointMode);
+	writer.Key("debugMode");
+	writer.Bool(_isDebugMode);
 	writer.Key("disableEffectCache");
 	writer.Bool(_isDisableEffectCache);
 	writer.Key("saveEffectSources");
@@ -700,7 +700,7 @@ bool AppSettings::_LoadSettings(std::string text) {
 		return false;
 	}
 
-	if (!LoadBoolSettingItem(root, "breakpointMode", _isBreakpointMode)) {
+	if (!LoadBoolSettingItem(root, "debugMode", _isDebugMode)) {
 		return false;
 	}
 	if (!LoadBoolSettingItem(root, "disableEffectCache", _isDisableEffectCache)) {

diff --git a/src/Magpie.UI/AppSettings.h b/src/Magpie.UI/AppSettings.h
@@ -128,12 +128,12 @@ class AppSettings {
 		_downCountChangedEvent.remove(token);
 	}
 
-	bool IsBreakpointMode() const noexcept {
-		return _isBreakpointMode;
+	bool IsDebugMode() const noexcept {
+		return _isDebugMode;
 	}
 
-	void IsBreakpointMode(bool value) noexcept {
-		_isBreakpointMode = value;
+	void IsDebugMode(bool value) noexcept {
+		_isDebugMode = value;
 	}
 
 	bool IsDisableEffectCache() const noexcept {
@@ -251,7 +251,7 @@ class AppSettings {
 	bool _isShowTrayIcon = true;
 	event<delegate<bool>> _isShowTrayIconChangedEvent;
 	bool _isAlwaysRunAsElevated = false;
-	bool _isBreakpointMode = false;
+	bool _isDebugMode = false;
 	bool _isDisableEffectCache = false;
 	bool _isSaveEffectSources = false;
 	bool _isWarningsAreErrors = false;

diff --git a/src/Magpie.UI/HomePage.xaml b/src/Magpie.UI/HomePage.xaml
@@ -150,12 +150,10 @@
 					</muxc:Expander.Header>
 					<muxc:Expander.Content>
 						<StackPanel Orientation="Vertical">
-							<local:SettingItem Title="始终以管理员身份运行"
-											   IsEnabled="{x:Bind ViewModel.IsProcessElevated, Mode=OneTime}"
+							<local:SettingItem IsEnabled="{x:Bind ViewModel.IsProcessElevated, Mode=OneTime}"
 											   Style="{StaticResource ExpanderContentSettingStyle}">
-								<local:SettingItem.ActionContent>
-									<ToggleSwitch IsOn="{x:Bind ViewModel.IsAlwaysRunAsElevated, Mode=TwoWay}" />
-								</local:SettingItem.ActionContent>
+								<CheckBox Content="始终以管理员身份运行"
+										  IsChecked="{x:Bind ViewModel.IsAlwaysRunAsElevated, Mode=TwoWay}" />
 							</local:SettingItem>
 							<muxc:InfoBar Title="以管理员身份重启 Magpie 以更改此设置"
 										  IsClosable="False"

diff --git a/src/Magpie.UI/MagService.cpp b/src/Magpie.UI/MagService.cpp
@@ -277,7 +277,7 @@ void MagService::_StartScale(HWND hWnd) {
 	}
 
 	// 应用全局配置
-	options.IsBreakpointMode(settings.IsBreakpointMode());
+	options.IsDebugMode(settings.IsDebugMode());
 	options.IsDisableEffectCache(settings.IsDisableEffectCache());
 	options.IsSaveEffectSources(settings.IsSaveEffectSources());
 	options.IsWarningsAreErrors(settings.IsWarningsAreErrors());

diff --git a/src/Magpie.UI/ScalingProfilePage.xaml b/src/Magpie.UI/ScalingProfilePage.xaml
@@ -315,13 +315,10 @@
 						</local:SettingItem>
 					</muxc:Expander.Header>
 					<muxc:Expander.Content>
-						<local:SettingItem Title="三重缓冲"
-										   Description="允许额外的延迟以提高性能"
-										   IsEnabled="{x:Bind ViewModel.IsVSync, Mode=OneWay}"
+						<local:SettingItem IsEnabled="{x:Bind ViewModel.IsVSync, Mode=OneWay}"
 										   Style="{StaticResource ExpanderContentSettingStyle}">
-							<local:SettingItem.ActionContent>
-								<ToggleSwitch IsOn="{x:Bind ViewModel.IsTripleBuffering, Mode=TwoWay}" />
-							</local:SettingItem.ActionContent>
+							<CheckBox Content="允许额外的延迟以提高性能"
+									  IsChecked="{x:Bind ViewModel.IsTripleBuffering, Mode=TwoWay}" />
 						</local:SettingItem>
 					</muxc:Expander.Content>
 				</muxc:Expander>

diff --git a/src/Magpie.UI/SettingItem.cpp b/src/Magpie.UI/SettingItem.cpp
@@ -11,6 +11,13 @@ using namespace Windows::UI::Xaml::Data;
 
 namespace winrt::Magpie::UI::implementation {
 
+DependencyProperty SettingItem::RawTitleProperty = DependencyProperty::Register(
+	L"RawTitle",
+	xaml_typename<IInspectable>(),
+	xaml_typename<Magpie::UI::SettingItem>(),
+	PropertyMetadata(nullptr, _OnTitleChanged)
+);
+
 DependencyProperty SettingItem::TitleProperty = DependencyProperty::Register(
 	L"Title",
 	xaml_typename<hstring>(),
@@ -43,6 +50,14 @@ SettingItem::SettingItem() {
 	InitializeComponent();
 }
 
+void SettingItem::RawTitle(IInspectable const& value) {
+	SetValue(RawTitleProperty, value);
+}
+
+IInspectable SettingItem::RawTitle() const {
+	return GetValue(RawTitleProperty);
+}
+
 void SettingItem::Title(const hstring& value) {
 	SetValue(TitleProperty, box_value(value));
 }
@@ -51,30 +66,36 @@ hstring SettingItem::Title() const {
 	return GetValue(TitleProperty).as<hstring>();
 }
 
-void SettingItem::Description(IInspectable value) {
+void SettingItem::Description(IInspectable const& value) {
 	SetValue(DescriptionProperty, value);
 }
 
 IInspectable SettingItem::Description() const {
 	return GetValue(DescriptionProperty);
 }
 
-void SettingItem::Icon(IInspectable value) {
+void SettingItem::Icon(IInspectable const& value) {
 	SetValue(IconProperty, value);
 }
 
 IInspectable SettingItem::Icon() const {
 	return GetValue(IconProperty);
 }
 
-void SettingItem::ActionContent(IInspectable value) {
+void SettingItem::ActionContent(IInspectable const& value) {
 	SetValue(ActionContentProperty, value);
 }
 
 IInspectable SettingItem::ActionContent() const {
 	return GetValue(ActionContentProperty);
 }
 
+void SettingItem::_OnRawTitleChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
+	SettingItem* that = get_self<SettingItem>(sender.as<default_interface<SettingItem>>());
+	that->_Update();
+	that->_propertyChangedEvent(*that, PropertyChangedEventArgs{ L"RawTitle" });
+}
+
 void SettingItem::_OnTitleChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&) {
 	SettingItem* that = get_self<SettingItem>(sender.as<default_interface<SettingItem>>());
 	that->_Update();
@@ -100,6 +121,8 @@ void SettingItem::_OnActionContentChanged(DependencyObject const& sender, Depend
 }
 
 void SettingItem::_Update() {
+	RawTitlePresenter().Visibility(RawTitle() == nullptr ? Visibility::Collapsed : Visibility::Visible);
+	TitleTextBlock().Visibility(Title().empty() ? Visibility::Collapsed : Visibility::Visible);
 	DescriptionPresenter().Visibility(Description() == nullptr ? Visibility::Collapsed : Visibility::Visible);
 	IconPresenter().Visibility(Icon() == nullptr ? Visibility::Collapsed : Visibility::Visible);
 }

diff --git a/src/Magpie.UI/SettingItem.h b/src/Magpie.UI/SettingItem.h
@@ -9,19 +9,23 @@ namespace winrt::Magpie::UI::implementation {
 struct SettingItem : SettingItemT<SettingItem> {
 	SettingItem();
 
+	void RawTitle(IInspectable const& value);
+
+	IInspectable RawTitle() const;
+
 	void Title(const hstring& value);
 
 	hstring Title() const;
 
-	void Description(IInspectable value);
+	void Description(IInspectable const& value);
 
 	IInspectable Description() const;
 
-	void Icon(IInspectable value);
+	void Icon(IInspectable const& value);
 
 	IInspectable Icon() const;
 
-	void ActionContent(IInspectable value);
+	void ActionContent(IInspectable const& value);
 
 	IInspectable ActionContent() const;
 
@@ -31,12 +35,14 @@ struct SettingItem : SettingItemT<SettingItem> {
 	event_token PropertyChanged(Data::PropertyChangedEventHandler const& value);
 	void PropertyChanged(event_token const& token);
 
+	static DependencyProperty RawTitleProperty;
 	static DependencyProperty TitleProperty;
 	static DependencyProperty DescriptionProperty;
 	static DependencyProperty IconProperty;
 	static DependencyProperty ActionContentProperty;
 
 private:
+	static void _OnRawTitleChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&);
 	static void _OnTitleChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&);
 	static void _OnDescriptionChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&);
 	static void _OnIconChanged(DependencyObject const& sender, DependencyPropertyChangedEventArgs const&);

diff --git a/src/Magpie.UI/SettingItem.idl b/src/Magpie.UI/SettingItem.idl
@@ -1,11 +1,13 @@
 namespace Magpie.UI
 {
+	[Windows.UI.Xaml.Markup.ContentProperty("RawTitle")]
 	[Windows.UI.Xaml.TemplateVisualState("Normal", "CommonStates")]
 	[Windows.UI.Xaml.TemplateVisualState("Disabled", "CommonStates")]
 	runtimeclass SettingItem : Windows.UI.Xaml.Controls.UserControl, [default] Windows.UI.Xaml.Data.INotifyPropertyChanged
 	{
 		SettingItem();
-
+
+		Object RawTitle;
 		String Title;
 		Object Description;
 		Object Icon;

diff --git a/src/Magpie.UI/SettingItem.xaml b/src/Magpie.UI/SettingItem.xaml
@@ -48,6 +48,13 @@
 						  Foreground="{ThemeResource CardPrimaryForegroundBrush}"
 						  IsTextScaleFactorEnabled="False" />
 
+		<ContentPresenter x:Name="RawTitlePresenter"
+						  Content="{x:Bind RawTitle, Mode=OneWay}"
+						  Grid.Column="1"
+						  Margin="0,0,16,0"
+						  HorizontalAlignment="Stretch"
+						  VerticalAlignment="Center" />
+
 		<StackPanel Grid.Column="1"
 					Margin="0,0,16,0"
 					HorizontalAlignment="Stretch"
@@ -93,6 +100,7 @@
 				<VisualState x:Name="Normal" />
 				<VisualState x:Name="Disabled">
 					<VisualState.Setters>
+						<Setter Target="RawTitlePresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
 						<Setter Target="TitleTextBlock.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
 						<Setter Target="DescriptionPresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
 						<Setter Target="IconPresenter.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />