From eada184e9e91a57f82b9ac013a989945e7078d8c Mon Sep 17 00:00:00 2001
From: Erich <eriforce@live.com>
Date: Tue, 27 Aug 2024 21:49:04 +0800
Subject: [PATCH] add a shortcut for 3dGameMode, resolve links in file system

---
 src/Magpie.App/App.cpp                       |   2 +-
 src/Magpie.App/App.idl                       |   1 +
 src/Magpie.App/AppSettings.cpp               |  51 +++++
 src/Magpie.App/AppSettings.h                 |   1 +
 src/Magpie.App/HomePage.xaml                 | 193 ++++++++++---------
 src/Magpie.App/Magpie.App.vcxproj            |   1 +
 src/Magpie.App/Magpie.App.vcxproj.filters    |   3 +
 src/Magpie.App/Profile.cpp                   |   6 +
 src/Magpie.App/Profile.h                     |   2 +
 src/Magpie.App/ProfileService.cpp            |   4 +-
 src/Magpie.App/ProfileViewModel.cpp          |   7 +
 src/Magpie.App/ProfileViewModel.h            |   3 +
 src/Magpie.App/Resources.language-en-US.resw |   3 +
 src/Magpie.App/ScalingService.cpp            |  12 ++
 src/Magpie.App/ScalingService.h              |   1 +
 src/Magpie.App/ShortcutHelper.cpp            |   4 +
 src/Magpie.App/ShortcutService.cpp           |   1 +
 src/Magpie.Core/ScalingRuntime.cpp           |  11 ++
 src/Magpie.Core/ScalingRuntime.h             |   2 +
 src/Magpie.Core/ScalingWindow.cpp            |  12 +-
 src/Magpie.Core/ScalingWindow.h              |   2 +
 21 files changed, 224 insertions(+), 98 deletions(-)
 create mode 100644 src/Magpie.App/Profile.cpp

diff --git a/src/Magpie.App/App.cpp b/src/Magpie.App/App.cpp
index 3c95a78d2..fc9eb3c41 100644
--- a/src/Magpie.App/App.cpp
+++ b/src/Magpie.App/App.cpp
@@ -30,12 +30,12 @@
 #include "EffectsService.h"
 #include "UpdateService.h"
 #include "LocalizationService.h"
-#include "Logger.h"
 
 namespace winrt::Magpie::App::implementation {
 
 App::App() {
 	UnhandledException([this](IInspectable const&, UnhandledExceptionEventArgs const& e) {
+		Logger::Get().Error(to_string(e.Message()));
 		Logger::Get().ComCritical("未处理的异常", e.Exception().value);
 
 		if (IsDebuggerPresent()) {
diff --git a/src/Magpie.App/App.idl b/src/Magpie.App/App.idl
index c7058f017..aa6835711 100644
--- a/src/Magpie.App/App.idl
+++ b/src/Magpie.App/App.idl
@@ -43,6 +43,7 @@ namespace Magpie.App {
 	enum ShortcutAction {
 		Scale,
 		Overlay,
+		Is3DGameMode,
 		COUNT_OR_NONE
 	};
 
diff --git a/src/Magpie.App/AppSettings.cpp b/src/Magpie.App/AppSettings.cpp
index 8eb94b250..8e9189f8f 100644
--- a/src/Magpie.App/AppSettings.cpp
+++ b/src/Magpie.App/AppSettings.cpp
@@ -499,6 +499,8 @@ bool AppSettings::_Save(const _AppSettingsData& data) noexcept {
 	writer.Uint(EncodeShortcut(data._shortcuts[(size_t)ShortcutAction::Scale]));
 	writer.Key("overlay");
 	writer.Uint(EncodeShortcut(data._shortcuts[(size_t)ShortcutAction::Overlay]));
+	writer.Key("3DGameMode");
+	writer.Uint(EncodeShortcut(data._shortcuts[(size_t)ShortcutAction::Is3DGameMode]));
 	writer.EndObject();
 
 	writer.Key("autoRestore");
@@ -654,6 +656,11 @@ void AppSettings::_LoadSettings(const rapidjson::GenericObject<true, rapidjson::
 		if (overlayNode != shortcutsObj.MemberEnd() && overlayNode->value.IsUint()) {
 			DecodeShortcut(overlayNode->value.GetUint(), _shortcuts[(size_t)ShortcutAction::Overlay]);
 		}
+
+		auto is3DGameModeNode = shortcutsObj.FindMember("3DGameMode");
+		if (is3DGameModeNode != shortcutsObj.MemberEnd() && is3DGameModeNode->value.IsUint()) {
+			DecodeShortcut(is3DGameModeNode->value.GetUint(), _shortcuts[(size_t)ShortcutAction::Is3DGameMode]);
+		}
 	}
 
 	JsonHelper::ReadBool(root, "autoRestore", _isAutoRestore);
@@ -771,6 +778,10 @@ bool AppSettings::_LoadProfile(
 		JsonHelper::ReadString(profileObj, "launcherPath", profile.launcherPath);
 		JsonHelper::ReadBool(profileObj, "autoScale", profile.isAutoScale);
 		JsonHelper::ReadString(profileObj, "launchParameters", profile.launchParameters);
+
+		if (!profile.isPackaged) {
+			_SetTruePath(profile);
+		}
 	}
 
 	JsonHelper::ReadInt(profileObj, "scalingMode", profile.scalingMode);
@@ -874,6 +885,37 @@ bool AppSettings::_LoadProfile(
 	return true;
 }
 
+fire_and_forget AppSettings::_SetTruePath(Profile& profile) const {
+	HANDLE handle = CreateFile(
+		profile.pathRule.c_str(),
+		GENERIC_READ,
+		FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+		NULL,
+		OPEN_EXISTING,
+		FILE_ATTRIBUTE_NORMAL,
+		NULL
+	);
+
+	if (handle == INVALID_HANDLE_VALUE) {
+		co_return;
+	}
+
+	TCHAR path[MAX_PATH];
+	DWORD length = GetFinalPathNameByHandle(
+		handle,
+		path,
+		MAX_PATH,
+		0
+	);
+
+	if (length > 0) {
+		// Skip `\\?\` prefix
+		profile.truePath = &path[4];
+	}
+
+	CloseHandle(handle);
+}
+
 bool AppSettings::_SetDefaultShortcuts() noexcept {
 	bool changed = false;
 
@@ -895,6 +937,15 @@ bool AppSettings::_SetDefaultShortcuts() noexcept {
 		changed = true;
 	}
 
+	Shortcut& is3DGameModeShortcut = _shortcuts[(size_t)ShortcutAction::Is3DGameMode];
+	if (is3DGameModeShortcut.IsEmpty()) {
+		is3DGameModeShortcut.win = true;
+		is3DGameModeShortcut.shift = true;
+		is3DGameModeShortcut.code = 'E';
+
+		changed = true;
+	}
+
 	return changed;
 }
 
diff --git a/src/Magpie.App/AppSettings.h b/src/Magpie.App/AppSettings.h
index c05a982f4..3a24fea88 100644
--- a/src/Magpie.App/AppSettings.h
+++ b/src/Magpie.App/AppSettings.h
@@ -305,6 +305,7 @@ class AppSettings : private _AppSettingsData {
 		Profile& profile,
 		bool isDefault = false
 	) const noexcept;
+	fire_and_forget _SetTruePath(Profile& profile) const;
 	bool _SetDefaultShortcuts() noexcept;
 	void _SetDefaultScalingModes() noexcept;
 
diff --git a/src/Magpie.App/HomePage.xaml b/src/Magpie.App/HomePage.xaml
index daf54f3a7..13f998073 100644
--- a/src/Magpie.App/HomePage.xaml
+++ b/src/Magpie.App/HomePage.xaml
@@ -1,45 +1,45 @@
 <Page x:Class="Magpie.App.HomePage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:Magpie.App"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-      mc:Ignorable="d">
+	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	  xmlns:local="using:Magpie.App"
+	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	  xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+	  mc:Ignorable="d">
 	<local:PageFrame x:Name="PageFrame"
-	                 x:Uid="Home_PageFrame">
+					 x:Uid="Home_PageFrame">
 		<local:SimpleStackPanel Padding="0,4,0,0"
-		                        HorizontalAlignment="Stretch"
-		                        ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
-		                        Spacing="{StaticResource SettingsGroupSpacing}">
+								HorizontalAlignment="Stretch"
+								ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
+								Spacing="{StaticResource SettingsGroupSpacing}">
 			<muxc:InfoBar x:Name="UpdateCard"
-			              Title="{x:Bind ViewModel.UpdateCardTitle, Mode=OneWay}"
-			              x:Load="{x:Bind ViewModel.ShowUpdateCard, Mode=OneWay}"
-			              IsOpen="{x:Bind ViewModel.ShowUpdateCard, Mode=TwoWay}"
-			              Severity="Informational">
+						  Title="{x:Bind ViewModel.UpdateCardTitle, Mode=OneWay}"
+						  x:Load="{x:Bind ViewModel.ShowUpdateCard, Mode=OneWay}"
+						  IsOpen="{x:Bind ViewModel.ShowUpdateCard, Mode=TwoWay}"
+						  Severity="Informational">
 				<local:SimpleStackPanel Margin="0,0,0,16"
-				                        Spacing="8">
+										Spacing="8">
 					<CheckBox x:Uid="Home_UpdateCard_AutoCheckForUpdates"
-					          IsChecked="{x:Bind ViewModel.IsAutoCheckForUpdates, Mode=TwoWay}" />
+							  IsChecked="{x:Bind ViewModel.IsAutoCheckForUpdates, Mode=TwoWay}"/>
 					<local:WrapPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
-					                 HorizontalSpacing="8"
-					                 Orientation="Horizontal"
-					                 VerticalSpacing="6">
+									 HorizontalSpacing="8"
+									 Orientation="Horizontal"
+									 VerticalSpacing="6">
 						<Button x:Uid="Home_UpdateCard_DownloadAndInstall"
-						        Click="{x:Bind ViewModel.DownloadAndInstall}"
-						        Style="{StaticResource AccentButtonStyle}" />
+								Click="{x:Bind ViewModel.DownloadAndInstall}"
+								Style="{StaticResource AccentButtonStyle}"/>
 						<Button x:Uid="Home_UpdateCard_ReleaseNotes"
-						        Click="{x:Bind ViewModel.ReleaseNotes}" />
+								Click="{x:Bind ViewModel.ReleaseNotes}"/>
 						<Button x:Uid="Home_UpdateCard_RemindMeLater"
-						        Click="{x:Bind ViewModel.RemindMeLater}" />
+								Click="{x:Bind ViewModel.RemindMeLater}"/>
 					</local:WrapPanel>
 				</local:SimpleStackPanel>
 			</muxc:InfoBar>
 			<local:SettingsGroup x:Uid="Home_Shortcuts">
 				<local:SettingsCard x:Uid="Home_Shortcuts_Scale"
-				                    IsWrapEnabled="True">
+									IsWrapEnabled="True">
 					<local:SettingsCard.HeaderIcon>
-						<FontIcon Glyph="&#xE740;" />
+						<FontIcon Glyph="&#xE740;"/>
 					</local:SettingsCard.HeaderIcon>
 					<local:ShortcutControl x:Uid="Home_Shortcuts_Scale_ShortcutControl">
 						<local:ShortcutControl.Action>
@@ -48,9 +48,9 @@
 					</local:ShortcutControl>
 				</local:SettingsCard>
 				<local:SettingsCard x:Uid="Home_Shortcuts_Overlay"
-				                    IsWrapEnabled="True">
+									IsWrapEnabled="True">
 					<local:SettingsCard.HeaderIcon>
-						<FontIcon Glyph="&#xE9D9;" />
+						<FontIcon Glyph="&#xE9D9;"/>
 					</local:SettingsCard.HeaderIcon>
 					<local:ShortcutControl x:Uid="Home_Shortcuts_Overlay_ShortcutControl">
 						<local:ShortcutControl.Action>
@@ -58,72 +58,83 @@
 						</local:ShortcutControl.Action>
 					</local:ShortcutControl>
 				</local:SettingsCard>
+				<local:SettingsCard x:Uid="Profile_General_3DGameMode"
+									IsWrapEnabled="True">
+					<local:SettingsCard.HeaderIcon>
+						<FontIcon Glyph="&#xE7FC;"/>
+					</local:SettingsCard.HeaderIcon>
+					<local:ShortcutControl x:Uid="Profile_General_3DGameMode_ShortcutControl">
+						<local:ShortcutControl.Action>
+							<local:ShortcutAction>Is3DGameMode</local:ShortcutAction>
+						</local:ShortcutControl.Action>
+					</local:ShortcutControl>
+				</local:SettingsCard>
 			</local:SettingsGroup>
 			<local:SettingsGroup x:Uid="Home_Activation">
 				<local:SettingsExpander x:Uid="Home_Activation_Timer">
 					<local:SettingsExpander.HeaderIcon>
-						<FontIcon Glyph="&#xE916;" />
+						<FontIcon Glyph="&#xE916;"/>
 					</local:SettingsExpander.HeaderIcon>
 					<local:SettingsExpander.Content>
 						<local:SimpleStackPanel Orientation="Horizontal"
-						                        Spacing="8">
+												Spacing="8">
 							<Grid Visibility="{x:Bind ViewModel.IsTimerOn, Mode=OneWay}">
 								<muxc:ProgressRing Width="30"
-								                   Height="30"
-								                   FlowDirection="RightToLeft"
-								                   IsActive="{x:Bind ViewModel.IsTimerOn, Mode=OneWay}"
-								                   IsIndeterminate="False"
-								                   Maximum="1"
-								                   Minimum="0"
-								                   Value="{x:Bind ViewModel.TimerProgressRingValue, Mode=OneWay}" />
+												   Height="30"
+												   FlowDirection="RightToLeft"
+												   IsActive="{x:Bind ViewModel.IsTimerOn, Mode=OneWay}"
+												   IsIndeterminate="False"
+												   Maximum="1"
+												   Minimum="0"
+												   Value="{x:Bind ViewModel.TimerProgressRingValue, Mode=OneWay}"/>
 								<TextBlock Margin="0,-1,0,0"
-								           HorizontalAlignment="Center"
-								           VerticalAlignment="Center"
-								           Text="{x:Bind ViewModel.TimerLabelText, Mode=OneWay}" />
+										   HorizontalAlignment="Center"
+										   VerticalAlignment="Center"
+										   Text="{x:Bind ViewModel.TimerLabelText, Mode=OneWay}"/>
 							</Grid>
 							<Button Click="{x:Bind ViewModel.ToggleTimer}"
-							        Content="{x:Bind ViewModel.TimerButtonText, Mode=OneWay}"
-							        IsEnabled="{x:Bind ViewModel.IsNotRunning, Mode=OneWay}" />
+									Content="{x:Bind ViewModel.TimerButtonText, Mode=OneWay}"
+									IsEnabled="{x:Bind ViewModel.IsNotRunning, Mode=OneWay}"/>
 						</local:SimpleStackPanel>
 					</local:SettingsExpander.Content>
 					<local:SettingsExpander.Items>
 						<local:SettingsCard x:Uid="Home_Activation_Timer_Delay">
 							<Slider Loaded="TimerSlider_Loaded"
-							        Maximum="5"
-							        Minimum="1"
-							        TickFrequency="1"
-							        Value="{x:Bind ViewModel.Delay, Mode=TwoWay}" />
+									Maximum="5"
+									Minimum="1"
+									TickFrequency="1"
+									Value="{x:Bind ViewModel.Delay, Mode=TwoWay}"/>
 						</local:SettingsCard>
 					</local:SettingsExpander.Items>
 				</local:SettingsExpander>
 				<Grid>
 					<local:SettingsCard x:Uid="Home_Activation_AutoRestore"
-					                    Visibility="{x:Bind ViewModel.IsWndToRestore, Mode=OneWay, Converter={StaticResource NegativeVisibilityConverter}}">
+										Visibility="{x:Bind ViewModel.IsWndToRestore, Mode=OneWay, Converter={StaticResource NegativeVisibilityConverter}}">
 						<local:SettingsCard.HeaderIcon>
-							<FontIcon Glyph="&#xE944;" />
+							<FontIcon Glyph="&#xE944;"/>
 						</local:SettingsCard.HeaderIcon>
 						<ToggleSwitch x:Uid="ToggleSwitch"
-						              IsOn="{x:Bind ViewModel.IsAutoRestore, Mode=TwoWay}" />
+									  IsOn="{x:Bind ViewModel.IsAutoRestore, Mode=TwoWay}"/>
 					</local:SettingsCard>
 					<local:SettingsExpander x:Uid="Home_Activation_AutoRestore"
-					                        IsExpanded="{x:Bind ViewModel.IsWndToRestore, Mode=OneWay}"
-					                        Visibility="{x:Bind ViewModel.IsWndToRestore, Mode=OneWay}">
+											IsExpanded="{x:Bind ViewModel.IsWndToRestore, Mode=OneWay}"
+											Visibility="{x:Bind ViewModel.IsWndToRestore, Mode=OneWay}">
 						<local:SettingsExpander.HeaderIcon>
-							<FontIcon Glyph="&#xE944;" />
+							<FontIcon Glyph="&#xE944;"/>
 						</local:SettingsExpander.HeaderIcon>
 						<local:SettingsExpander.Content>
 							<ToggleSwitch x:Uid="ToggleSwitch"
-							              IsOn="{x:Bind ViewModel.IsAutoRestore, Mode=TwoWay}" />
+										  IsOn="{x:Bind ViewModel.IsAutoRestore, Mode=TwoWay}"/>
 						</local:SettingsExpander.Content>
 						<local:SettingsExpander.Items>
 							<local:SettingsCard Header="{x:Bind ViewModel.RestoreWndDesc, Mode=OneWay}">
 								<local:SimpleStackPanel Orientation="Horizontal"
-								                        Spacing="8">
+														Spacing="8">
 									<Button x:Uid="Home_Activation_AutoRestore_Activate"
-									        Click="{x:Bind ViewModel.ActivateRestore}"
-									        Style="{StaticResource AccentButtonStyle}" />
+											Click="{x:Bind ViewModel.ActivateRestore}"
+											Style="{StaticResource AccentButtonStyle}"/>
 									<Button x:Uid="Home_Activation_AutoRestore_Clear"
-									        Click="{x:Bind ViewModel.ClearRestore}" />
+											Click="{x:Bind ViewModel.ClearRestore}"/>
 								</local:SimpleStackPanel>
 							</local:SettingsCard>
 						</local:SettingsExpander.Items>
@@ -131,98 +142,98 @@
 				</Grid>
 				<local:SettingsCard x:Uid="Home_Activation_AllowScalingMaximized">
 					<ToggleSwitch x:Uid="ToggleSwitch"
-					              IsOn="{x:Bind ViewModel.IsAllowScalingMaximized, Mode=TwoWay}" />
+								  IsOn="{x:Bind ViewModel.IsAllowScalingMaximized, Mode=TwoWay}"/>
 				</local:SettingsCard>
 			</local:SettingsGroup>
 			<local:SettingsGroup x:Uid="Home_TouchSupport">
 				<local:SettingsCard x:Uid="Home_TouchSupport_EnableTouchSupport">
 					<local:SettingsCard.HeaderIcon>
-						<FontIcon Glyph="&#xEBFC;" />
+						<FontIcon Glyph="&#xEBFC;"/>
 					</local:SettingsCard.HeaderIcon>
 					<local:SettingsCard.Description>
 						<local:SimpleStackPanel Orientation="Vertical">
-							<TextBlock x:Uid="Home_TouchSupport_EnableTouchSupport_Description" />
+							<TextBlock x:Uid="Home_TouchSupport_EnableTouchSupport_Description"/>
 							<HyperlinkButton x:Uid="Home_TouchSupport_EnableTouchSupport_LearnMore"
-							                 NavigateUri="{x:Bind ViewModel.TouchSupportLearnMoreUrl, Mode=OneTime}" />
+											 NavigateUri="{x:Bind ViewModel.TouchSupportLearnMoreUrl, Mode=OneTime}"/>
 						</local:SimpleStackPanel>
 					</local:SettingsCard.Description>
 					<ToggleSwitch x:Uid="ToggleSwitch"
-					              IsOn="{x:Bind ViewModel.IsTouchSupportEnabled, Mode=TwoWay}" />
+								  IsOn="{x:Bind ViewModel.IsTouchSupportEnabled, Mode=TwoWay}"/>
 				</local:SettingsCard>
 				<muxc:InfoBar x:Uid="Home_TouchSupport_InfoBar"
-				              IsClosable="False"
-				              IsOpen="{x:Bind ViewModel.IsShowTouchSupportInfoBar, Mode=OneWay}"
-				              Severity="Informational">
+							  IsClosable="False"
+							  IsOpen="{x:Bind ViewModel.IsShowTouchSupportInfoBar, Mode=OneWay}"
+							  Severity="Informational">
 					<muxc:InfoBar.Resources>
-						<ResourceDictionary Source="ms-appx:///Magpie.App/BlueInfoBar.xaml" />
+						<ResourceDictionary Source="ms-appx:///Magpie.App/BlueInfoBar.xaml"/>
 					</muxc:InfoBar.Resources>
 				</muxc:InfoBar>
 			</local:SettingsGroup>
 			<local:SettingsGroup x:Uid="Home_Advanced">
 				<local:SettingsCard x:Uid="Home_Advanced_InlineParams">
 					<local:SettingsCard.HeaderIcon>
-						<FontIcon Glyph="&#xE9E9;" />
+						<FontIcon Glyph="&#xE9E9;"/>
 					</local:SettingsCard.HeaderIcon>
 					<ToggleSwitch x:Uid="ToggleSwitch"
-					              IsOn="{x:Bind ViewModel.IsInlineParams, Mode=TwoWay}" />
+								  IsOn="{x:Bind ViewModel.IsInlineParams, Mode=TwoWay}"/>
 				</local:SettingsCard>
 				<local:SettingsCard x:Uid="Home_Advanced_SimulateExclusiveFullscreen">
 					<local:SettingsCard.HeaderIcon>
-						<FontIcon Glyph="&#xec46;" />
+						<FontIcon Glyph="&#xec46;"/>
 					</local:SettingsCard.HeaderIcon>
 					<ToggleSwitch x:Uid="ToggleSwitch"
-					              IsOn="{x:Bind ViewModel.IsSimulateExclusiveFullscreen, Mode=TwoWay}"
-					              Toggled="SimulateExclusiveFullscreenToggleSwitch_Toggled" />
+								  IsOn="{x:Bind ViewModel.IsSimulateExclusiveFullscreen, Mode=TwoWay}"
+								  Toggled="SimulateExclusiveFullscreenToggleSwitch_Toggled"/>
 				</local:SettingsCard>
 				<muxc:InfoBar x:Uid="Home_Advanced_SimulateExclusiveFullscreen_InfoBar"
-				              IsClosable="False"
-				              IsOpen="{x:Bind ViewModel.IsSimulateExclusiveFullscreen, Mode=OneWay}"
-				              Severity="Warning" />
+							  IsClosable="False"
+							  IsOpen="{x:Bind ViewModel.IsSimulateExclusiveFullscreen, Mode=OneWay}"
+							  Severity="Warning"/>
 				<local:SettingsExpander x:Name="DeveloperModeExpander"
-				                        x:Uid="Home_Advanced_DeveloperOptions"
-				                        x:Load="{x:Bind ViewModel.IsDeveloperMode, Mode=OneWay}"
-				                        IsExpanded="True">
+										x:Uid="Home_Advanced_DeveloperOptions"
+										x:Load="{x:Bind ViewModel.IsDeveloperMode, Mode=OneWay}"
+										IsExpanded="True">
 					<local:SettingsExpander.HeaderIcon>
-						<FontIcon Glyph="&#xEC7A;" />
+						<FontIcon Glyph="&#xEC7A;"/>
 					</local:SettingsExpander.HeaderIcon>
 					<local:SettingsExpander.Content>
 						<ToggleSwitch x:Uid="ToggleSwitch"
-						              IsOn="{x:Bind ViewModel.IsDeveloperMode, Mode=TwoWay}" />
+									  IsOn="{x:Bind ViewModel.IsDeveloperMode, Mode=TwoWay}"/>
 					</local:SettingsExpander.Content>
 					<local:SettingsExpander.Items>
 						<local:SettingsCard ContentAlignment="Left">
 							<CheckBox x:Uid="Home_Advanced_DeveloperOptions_DebugMode"
-							          IsChecked="{x:Bind ViewModel.IsDebugMode, Mode=TwoWay}" />
+									  IsChecked="{x:Bind ViewModel.IsDebugMode, Mode=TwoWay}"/>
 						</local:SettingsCard>
 						<local:SettingsCard ContentAlignment="Left">
 							<CheckBox x:Uid="Home_Advanced_DeveloperOptions_DisableEffectCache"
-							          IsChecked="{x:Bind ViewModel.IsEffectCacheDisabled, Mode=TwoWay}" />
+									  IsChecked="{x:Bind ViewModel.IsEffectCacheDisabled, Mode=TwoWay}"/>
 						</local:SettingsCard>
 						<local:SettingsCard ContentAlignment="Left">
 							<CheckBox x:Uid="Home_Advanced_DeveloperOptions_DisableFontCache"
-							          IsChecked="{x:Bind ViewModel.IsFontCacheDisabled, Mode=TwoWay}" />
+									  IsChecked="{x:Bind ViewModel.IsFontCacheDisabled, Mode=TwoWay}"/>
 						</local:SettingsCard>
 						<local:SettingsCard ContentAlignment="Left">
 							<CheckBox x:Uid="Home_Advanced_DeveloperOptions_SaveEffectSources"
-							          IsChecked="{x:Bind ViewModel.IsSaveEffectSources, Mode=TwoWay}" />
+									  IsChecked="{x:Bind ViewModel.IsSaveEffectSources, Mode=TwoWay}"/>
 						</local:SettingsCard>
 						<local:SettingsCard ContentAlignment="Left">
 							<CheckBox x:Uid="Home_Advanced_DeveloperOptions_WarningsAreErrors"
-							          IsChecked="{x:Bind ViewModel.IsWarningsAreErrors, Mode=TwoWay}" />
+									  IsChecked="{x:Bind ViewModel.IsWarningsAreErrors, Mode=TwoWay}"/>
 						</local:SettingsCard>
 						<local:SettingsCard x:Uid="Home_Advanced_DeveloperOptions_DuplicateFrameDetection"
-						                    IsWrapEnabled="True">
+											IsWrapEnabled="True">
 							<ComboBox DropDownOpened="ComboBox_DropDownOpened"
-							          SelectedIndex="{x:Bind ViewModel.DuplicateFrameDetectionMode, Mode=TwoWay}">
-								<ComboBoxItem x:Uid="Home_Advanced_DeveloperOptions_DuplicateFrameDetection_Always" />
-								<ComboBoxItem x:Uid="Home_Advanced_DeveloperOptions_DuplicateFrameDetection_Dynamic" />
-								<ComboBoxItem x:Uid="Home_Advanced_DeveloperOptions_DuplicateFrameDetection_Never" />
+									  SelectedIndex="{x:Bind ViewModel.DuplicateFrameDetectionMode, Mode=TwoWay}">
+								<ComboBoxItem x:Uid="Home_Advanced_DeveloperOptions_DuplicateFrameDetection_Always"/>
+								<ComboBoxItem x:Uid="Home_Advanced_DeveloperOptions_DuplicateFrameDetection_Dynamic"/>
+								<ComboBoxItem x:Uid="Home_Advanced_DeveloperOptions_DuplicateFrameDetection_Never"/>
 							</ComboBox>
 						</local:SettingsCard>
 						<local:SettingsCard ContentAlignment="Left"
-						                    IsEnabled="{x:Bind ViewModel.IsDynamicDection, Mode=OneWay}">
+											IsEnabled="{x:Bind ViewModel.IsDynamicDection, Mode=OneWay}">
 							<CheckBox x:Uid="Home_Advanced_DeveloperOptions_EnableStatisticsForDynamicDetection"
-							          IsChecked="{x:Bind ViewModel.IsStatisticsForDynamicDetectionEnabled, Mode=TwoWay}" />
+									  IsChecked="{x:Bind ViewModel.IsStatisticsForDynamicDetectionEnabled, Mode=TwoWay}"/>
 						</local:SettingsCard>
 					</local:SettingsExpander.Items>
 				</local:SettingsExpander>
diff --git a/src/Magpie.App/Magpie.App.vcxproj b/src/Magpie.App/Magpie.App.vcxproj
index 494cdae10..07c2fff53 100644
--- a/src/Magpie.App/Magpie.App.vcxproj
+++ b/src/Magpie.App/Magpie.App.vcxproj
@@ -307,6 +307,7 @@
       <DependentUpon>SettingsExpanderCornerRadiusConverter.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
+    <ClCompile Include="Profile.cpp" />
     <ClCompile Include="ShortcutService.cpp" />
     <ClCompile Include="Shortcut.cpp" />
     <ClCompile Include="IconHelper.cpp" />
diff --git a/src/Magpie.App/Magpie.App.vcxproj.filters b/src/Magpie.App/Magpie.App.vcxproj.filters
index 46e5e8dfe..080d5064b 100644
--- a/src/Magpie.App/Magpie.App.vcxproj.filters
+++ b/src/Magpie.App/Magpie.App.vcxproj.filters
@@ -59,6 +59,9 @@
     <ClCompile Include="TouchHelper.cpp">
       <Filter>Helpers</Filter>
     </ClCompile>
+    <ClCompile Include="Profile.cpp">
+      <Filter>Models</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
diff --git a/src/Magpie.App/Profile.cpp b/src/Magpie.App/Profile.cpp
new file mode 100644
index 000000000..125b5f22b
--- /dev/null
+++ b/src/Magpie.App/Profile.cpp
@@ -0,0 +1,6 @@
+#include "pch.h"
+#include "Profile.h"
+
+std::wstring winrt::Magpie::App::Profile::GetTruePath() const noexcept {
+	return truePath.empty() ? pathRule : truePath;
+}
\ No newline at end of file
diff --git a/src/Magpie.App/Profile.h b/src/Magpie.App/Profile.h
index 9a6c71eee..95a135d00 100644
--- a/src/Magpie.App/Profile.h
+++ b/src/Magpie.App/Profile.h
@@ -45,6 +45,8 @@ struct Profile {
 
 	// 若为打包应用，PathRule 存储 AUMID
 	std::wstring pathRule;
+	std::wstring truePath;
+	std::wstring GetTruePath() const noexcept;
 	std::wstring classNameRule;
 
 	// 如果在同一个驱动器上则存储相对路径，否则存储绝对路径
diff --git a/src/Magpie.App/ProfileService.cpp b/src/Magpie.App/ProfileService.cpp
index 383b14c68..6671ea35a 100644
--- a/src/Magpie.App/ProfileService.cpp
+++ b/src/Magpie.App/ProfileService.cpp
@@ -111,7 +111,7 @@ static bool TestNewProfileImpl(
 		}
 	} else {
 		for (const Profile& rule : profiles) {
-			if (!rule.isPackaged && rule.pathRule == pathOrAumid && rule.classNameRule == parsedClassName) {
+			if (!rule.isPackaged && rule.GetTruePath() == pathOrAumid && rule.classNameRule == parsedClassName) {
 				return false;
 			}
 		}
@@ -241,7 +241,7 @@ const Profile* ProfileService::GetProfileForWindow(HWND hWnd, bool forAutoScale)
 			}
 		}
 		
-		if (profile.pathRule == path) {
+		if (profile.GetTruePath() == path) {
 			return &profile;
 		}
 	}
diff --git a/src/Magpie.App/ProfileViewModel.cpp b/src/Magpie.App/ProfileViewModel.cpp
index ab6764f62..6fd2dfe23 100644
--- a/src/Magpie.App/ProfileViewModel.cpp
+++ b/src/Magpie.App/ProfileViewModel.cpp
@@ -84,6 +84,13 @@ ProfileViewModel::ProfileViewModel(int profileIdx) : _isDefaultProfile(profileId
 			}
 		);
 
+		_is3DGameModeChangedRevoker = ScalingService::Get().Is3DGameModeChanged(
+			auto_revoke,
+			[this](bool value) {
+				RaisePropertyChanged(L"Is3DGameMode");
+			}
+		);
+
 		if (_data->isPackaged) {
 			AppXReader appxReader;
 			_isProgramExist = appxReader.Initialize(_data->pathRule);
diff --git a/src/Magpie.App/ProfileViewModel.h b/src/Magpie.App/ProfileViewModel.h
index 84d90f36b..6afcab0ea 100644
--- a/src/Magpie.App/ProfileViewModel.h
+++ b/src/Magpie.App/ProfileViewModel.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "ProfileViewModel.g.h"
 #include "SmallVector.h"
+#include "WinRTUtils.h"
 
 namespace winrt::Magpie::App {
 struct Profile;
@@ -141,6 +142,8 @@ struct ProfileViewModel : ProfileViewModelT<ProfileViewModel>,
 	void IsDirectFlipDisabled(bool value);
 
 private:
+	WinRTUtils::EventRevoker _is3DGameModeChangedRevoker;
+
 	fire_and_forget _LoadIcon(FrameworkElement const& rootPage);
 
 	bool _isProgramExist = true;
diff --git a/src/Magpie.App/Resources.language-en-US.resw b/src/Magpie.App/Resources.language-en-US.resw
index 7db48ffe0..77837d824 100644
--- a/src/Magpie.App/Resources.language-en-US.resw
+++ b/src/Magpie.App/Resources.language-en-US.resw
@@ -270,6 +270,9 @@
   <data name="Home_Shortcuts_Overlay_ShortcutControl.Title" xml:space="preserve">
     <value>In-game overlay shortcut</value>
   </data>
+  <data name="Profile_General_3DGameMode_ShortcutControl.Title" xml:space="preserve">
+    <value>3D game mode</value>
+  </data>
   <data name="Home_Shortcuts_Scale.Header" xml:space="preserve">
     <value>Scale</value>
   </data>
diff --git a/src/Magpie.App/ScalingService.cpp b/src/Magpie.App/ScalingService.cpp
index 938bcabf2..05bcedd5a 100644
--- a/src/Magpie.App/ScalingService.cpp
+++ b/src/Magpie.App/ScalingService.cpp
@@ -126,6 +126,18 @@ void ScalingService::_ShortcutService_ShortcutPressed(ShortcutAction action) {
 		}
 		break;
 	}
+	case ShortcutAction::Is3DGameMode:
+	{
+		if (_scalingRuntime->IsRunning()) {
+			Profile* profile = const_cast<Profile*>(ProfileService::Get().GetProfileForWindow(_hwndCurSrc, false));
+			bool newValue = !profile->Is3DGameMode();
+			profile->Is3DGameMode(newValue);
+			_scalingRuntime->Set3DGameMode(newValue);
+			Is3DGameModeChanged.Invoke(newValue);
+			return;
+		}
+		break;
+	}
 	default:
 		break;
 	}
diff --git a/src/Magpie.App/ScalingService.h b/src/Magpie.App/ScalingService.h
index ec8a0864f..019a4daf5 100644
--- a/src/Magpie.App/ScalingService.h
+++ b/src/Magpie.App/ScalingService.h
@@ -53,6 +53,7 @@ class ScalingService {
 	WinRTUtils::Event<delegate<double>> TimerTick;
 	WinRTUtils::Event<delegate<HWND>> WndToRestoreChanged;
 	WinRTUtils::Event<delegate<bool>> IsRunningChanged;
+	WinRTUtils::Event<delegate<bool>> Is3DGameModeChanged;
 
 private:
 	ScalingService() = default;
diff --git a/src/Magpie.App/ShortcutHelper.cpp b/src/Magpie.App/ShortcutHelper.cpp
index 7240b086e..d5465f2cb 100644
--- a/src/Magpie.App/ShortcutHelper.cpp
+++ b/src/Magpie.App/ShortcutHelper.cpp
@@ -13,6 +13,8 @@ std::string ShortcutHelper::ToString(winrt::Magpie::App::ShortcutAction action)
 		return "Scale";
 	case ShortcutAction::Overlay:
 		return "Overlay";
+	case ShortcutAction::Is3DGameMode:
+		return "3DGameMode";
 	case ShortcutAction::COUNT_OR_NONE:
 		return "None";
 	default:
@@ -126,6 +128,8 @@ hstring to_hstring(ShortcutAction action) {
 		return L"Scale";
 	case ShortcutAction::Overlay:
 		return L"Overlay";
+	case ShortcutAction::Is3DGameMode:
+		return L"3DGameMode";
 	case ShortcutAction::COUNT_OR_NONE:
 		return L"None";
 	default:
diff --git a/src/Magpie.App/ShortcutService.cpp b/src/Magpie.App/ShortcutService.cpp
index 01b4d5df2..47f0dda4e 100644
--- a/src/Magpie.App/ShortcutService.cpp
+++ b/src/Magpie.App/ShortcutService.cpp
@@ -37,6 +37,7 @@ void ShortcutService::Initialize() {
 
 	_RegisterShortcut(ShortcutAction::Scale);
 	_RegisterShortcut(ShortcutAction::Overlay);
+	_RegisterShortcut(ShortcutAction::Is3DGameMode);
 
 	AppSettings::Get().ShortcutChanged({ this, &ShortcutService::_AppSettings_OnShortcutChanged });
 
diff --git a/src/Magpie.Core/ScalingRuntime.cpp b/src/Magpie.Core/ScalingRuntime.cpp
index e3745b668..dd32ba08c 100644
--- a/src/Magpie.Core/ScalingRuntime.cpp
+++ b/src/Magpie.Core/ScalingRuntime.cpp
@@ -93,6 +93,17 @@ void ScalingRuntime::Stop() {
 	});
 }
 
+void ScalingRuntime::Set3DGameMode(bool value) noexcept {
+	if (!IsRunning()) {
+		return;
+	}
+
+	_Dispatcher().TryEnqueue([value]() {
+		ScalingWindow& scalingWindow = ScalingWindow::Get();
+		scalingWindow.Set3DGameMode(value);
+	});
+}
+
 // 返回值:
 // -1: 应取消缩放
 // 0: 仍在调整中
diff --git a/src/Magpie.Core/ScalingRuntime.h b/src/Magpie.Core/ScalingRuntime.h
index 4ce5cd02f..8841ce298 100644
--- a/src/Magpie.Core/ScalingRuntime.h
+++ b/src/Magpie.Core/ScalingRuntime.h
@@ -17,6 +17,8 @@ class ScalingRuntime {
 
 	void Stop();
 
+	void Set3DGameMode(bool value) noexcept;
+
 	bool IsRunning() const noexcept {
 		return _state.load(std::memory_order_relaxed) != _State::Idle;
 	}
diff --git a/src/Magpie.Core/ScalingWindow.cpp b/src/Magpie.Core/ScalingWindow.cpp
index 8dc335ae2..b8ffadb69 100644
--- a/src/Magpie.Core/ScalingWindow.cpp
+++ b/src/Magpie.Core/ScalingWindow.cpp
@@ -352,6 +352,10 @@ void ScalingWindow::CleanAfterSrcRepositioned() noexcept {
 	_isSrcRepositioning = false;
 }
 
+void ScalingWindow::Set3DGameMode(bool value) noexcept {
+	_options.Is3DGameMode(value);
+}
+
 LRESULT ScalingWindow::_MessageHandler(UINT msg, WPARAM wParam, LPARAM lParam) noexcept {
 	if (_renderer) {
 		_renderer->MessageHandler(msg, wParam, lParam);
@@ -471,13 +475,13 @@ int ScalingWindow::_CheckSrcState() const noexcept {
 		HWND hwndForeground = GetForegroundWindow();
 
 		// 3D 游戏模式下打开叠加层后如果源窗口意外回到前台应关闭叠加层
-		if (_options.Is3DGameMode() && _renderer->IsOverlayVisible() && hwndForeground == _hwndSrc) {
-			_renderer->SetOverlayVisibility(false, true);
-		}
+		// if (_options.Is3DGameMode() && _renderer->IsOverlayVisible() && hwndForeground == _hwndSrc) {
+		// 	_renderer->SetOverlayVisibility(false, true);
+		// }
 
 		// 在 3D 游戏模式下打开叠加层则全屏窗口可以接收焦点
 		if (!_options.Is3DGameMode() || !_renderer->IsOverlayVisible() || hwndForeground != _hWnd) {
-			if (hwndForeground && hwndForeground != _hwndSrc && !_CheckForeground(hwndForeground)) {
+			if (hwndForeground && hwndForeground != _hwndSrc && hwndForeground != _hWnd && !_CheckForeground(hwndForeground)) {
 				Logger::Get().Info("前台窗口已改变");
 				return 1;
 			}
diff --git a/src/Magpie.Core/ScalingWindow.h b/src/Magpie.Core/ScalingWindow.h
index b68521ec1..5b8a21e8d 100644
--- a/src/Magpie.Core/ScalingWindow.h
+++ b/src/Magpie.Core/ScalingWindow.h
@@ -58,6 +58,8 @@ class ScalingWindow : public WindowBase<ScalingWindow> {
 
 	void CleanAfterSrcRepositioned() noexcept;
 
+	void Set3DGameMode(bool value) noexcept;
+
 protected:
 	LRESULT _MessageHandler(UINT msg, WPARAM wParam, LPARAM lParam) noexcept;