feat: 管理员身份下不展示提示

Blinue · May 8, 2024 · 38e44d8 · 38e44d8
1 parent eebba08
commit 38e44d8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/src/Magpie.App/HomePage.xaml b/src/Magpie.App/HomePage.xaml
@@ -150,7 +150,7 @@
 				</local:SettingsCard>
 				<muxc:InfoBar x:Uid="Home_TouchSupport_InfoBar"
 				              IsClosable="False"
-				              IsOpen="{x:Bind ViewModel.IsTouchSupportEnabled, Mode=OneWay}"
+				              IsOpen="{x:Bind ViewModel.IsShowTouchSupportInfoBar, Mode=OneWay}"
 				              Severity="Informational">
 					<muxc:InfoBar.Resources>
 						<ResourceDictionary Source="ms-appx:///Magpie.App/BlueInfoBar.xaml" />

diff --git a/src/Magpie.App/HomeViewModel.cpp b/src/Magpie.App/HomeViewModel.cpp
@@ -192,7 +192,7 @@ bool HomeViewModel::IsTouchSupportEnabled() const noexcept {
 }
 
 fire_and_forget HomeViewModel::IsTouchSupportEnabled(bool value) {
-	if (TouchHelper::IsTouchSupportEnabled() == value) {
+	if (IsTouchSupportEnabled() == value) {
 		co_return;
 	}
 
@@ -209,9 +209,14 @@ fire_and_forget HomeViewModel::IsTouchSupportEnabled(bool value) {
 
 	if (weakThis.get()) {
 		RaisePropertyChanged(L"IsTouchSupportEnabled");
+		RaisePropertyChanged(L"IsShowTouchSupportInfoBar");
 	}
 }
 
+bool HomeViewModel::IsShowTouchSupportInfoBar() const noexcept {
+	return !Win32Utils::IsProcessElevated() && IsTouchSupportEnabled();
+}
+
 bool HomeViewModel::IsAllowScalingMaximized() const noexcept {
 	return AppSettings::Get().IsAllowScalingMaximized();
 }

diff --git a/src/Magpie.App/HomeViewModel.h b/src/Magpie.App/HomeViewModel.h
@@ -53,6 +53,8 @@ struct HomeViewModel : HomeViewModelT<HomeViewModel>, wil::notify_property_chang
 	bool IsTouchSupportEnabled() const noexcept;
 	fire_and_forget IsTouchSupportEnabled(bool value);
 
+	bool IsShowTouchSupportInfoBar() const noexcept;
+
 	bool IsAllowScalingMaximized() const noexcept;
 	void IsAllowScalingMaximized(bool value);
 

diff --git a/src/Magpie.App/HomeViewModel.idl b/src/Magpie.App/HomeViewModel.idl
@@ -26,6 +26,7 @@ namespace Magpie.App {
 		void ClearRestore();
 
 		Boolean IsTouchSupportEnabled;
+		Boolean IsShowTouchSupportInfoBar { get; };
 		Boolean IsAllowScalingMaximized;
 		Boolean IsInlineParams;
 		Boolean IsSimulateExclusiveFullscreen;