Merge pull request #670 from unoplatform/mergify/bp/legacy/3x/pr-656

unoplatform · Jul 22, 2023 · 2680fbc · 2680fbc
2 parents fc3ece3 + a1e573e
commit 2680fbc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml.Navigation.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml.Navigation.cs
@@ -136,6 +136,10 @@ private void OnNavigationItemInvoked(MUXC.NavigationView sender, MUXC.Navigation
 			{
 				ShellNavigateTo(sample, trySynchronizeCurrentItem: false);
 			}
+			else if (e.IsSettingsInvoked)
+			{
+				_shell.ActivateDebugPanel();
+			}
 		}
 
 		private void AddNavigationItems(MUXC.NavigationView nv)

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Shell.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Shell.xaml
@@ -22,7 +22,7 @@
 							 utu:SafeArea.Insets="VisibleBounds"
 							 x:Name="NavigationViewControl"
 							 OpenPaneLength="260"
-							 IsSettingsVisible="False"
+							 IsSettingsVisible="True"
 							 IsPaneOpen="True"
 							 IsPaneVisible="True"
 							 IsPaneToggleButtonVisible="False"

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Shell.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Shell.xaml.cs
@@ -66,12 +66,17 @@ public Shell()
 
 		private void OnLoaded(object sender, RoutedEventArgs e)
 		{
-#if DEBUG
-			this.FindName("DebugPanel"); // materialized x:Load=false element
+#if DEBUG && false
+			ActivateDebugPanel();
 #endif
 			SetDarkLightToggleInitialState();
 		}
 
+		internal void ActivateDebugPanel()
+		{
+			this.FindName("DebugPanel"); // materialize x:Load=false element
+		}
+
 		private void SetDarkLightToggleInitialState()
 		{
 #if !IS_WINUI