Added new navigation system for Pined section (#511)

Leo-Corporation · Dec 25, 2023 · ad396d4 · ad396d4
1 parent b146c40
commit ad396d4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 24 deletions.
diff --git a/InternetTest/InternetTest/MainWindow.xaml b/InternetTest/InternetTest/MainWindow.xaml
@@ -265,13 +265,14 @@
                                 Margin="0 10"
                                 FontWeight="Bold"
                                 Text="{x:Static lang:Resources.Pinned}" />
-                            <Button
+                            <RadioButton
                                 x:Name="HomePageBtn"
                                 HorizontalContentAlignment="Left"
                                 Background="Transparent"
                                 BorderThickness="0"
+                                GroupName="NavBar"
                                 Click="HomePageBtn_Click"
-                                Style="{DynamicResource StandardButton}">
+                                Style="{DynamicResource NavBarButton}">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
@@ -307,7 +308,7 @@
                                         Text="{x:Static lang:Resources.Home}" />
                                 </Grid>
 
-                                <Button.Triggers>
+                                <RadioButton.Triggers>
                                     <EventTrigger RoutedEvent="MouseEnter">
                                         <BeginStoryboard>
                                             <Storyboard>
@@ -320,16 +321,17 @@
                                             </Storyboard>
                                         </BeginStoryboard>
                                     </EventTrigger>
-                                </Button.Triggers>
-                            </Button>
-                            <Button
+                                </RadioButton.Triggers>
+                            </RadioButton>
+                            <RadioButton
                                 x:Name="HistoryPageBtn"
                                 Margin="0 5 0 0"
                                 HorizontalContentAlignment="Left"
                                 Background="Transparent"
                                 BorderThickness="0"
+                                GroupName="NavBar"
                                 Click="HistoryPageBtn_Click"
-                                Style="{DynamicResource StandardButton}">
+                                Style="{DynamicResource NavBarButton}">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
@@ -372,7 +374,7 @@
                                         Text="{x:Static lang:Resources.History}" />
                                 </Grid>
 
-                                <Button.Triggers>
+                                <RadioButton.Triggers>
                                     <EventTrigger RoutedEvent="MouseEnter">
                                         <BeginStoryboard>
                                             <Storyboard>
@@ -393,16 +395,17 @@
                                             </Storyboard>
                                         </BeginStoryboard>
                                     </EventTrigger>
-                                </Button.Triggers>
-                            </Button>
-                            <Button
+                                </RadioButton.Triggers>
+                            </RadioButton>
+                            <RadioButton
                                 x:Name="SettingsPageBtn"
                                 Margin="0 5 0 0"
                                 HorizontalContentAlignment="Left"
                                 Background="Transparent"
                                 BorderThickness="0"
+                                GroupName="NavBar"
                                 Click="SettingsPageBtn_Click"
-                                Style="{DynamicResource StandardButton}">
+                                Style="{DynamicResource NavBarButton}">
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
@@ -439,7 +442,7 @@
                                         Text="{x:Static lang:Resources.Settings}" />
                                 </Grid>
 
-                                <Button.Triggers>
+                                <RadioButton.Triggers>
                                     <EventTrigger RoutedEvent="MouseEnter">
                                         <BeginStoryboard>
                                             <Storyboard>
@@ -452,8 +455,8 @@
                                             </Storyboard>
                                         </BeginStoryboard>
                                     </EventTrigger>
-                                </Button.Triggers>
-                            </Button>
+                                </RadioButton.Triggers>
+                            </RadioButton>
 
                             <TextBlock
                                 Margin="0 10"

diff --git a/InternetTest/InternetTest/MainWindow.xaml.cs b/InternetTest/InternetTest/MainWindow.xaml.cs
@@ -79,12 +79,12 @@ private void InitUI()
 			case AppPages.Home:
 				PageDisplayer.Content = Global.HomePage;
 				UnCheckAllButton();
-				CheckButton(HomePageBtn, true);
+				HomePageBtn.IsChecked = true;
 				break;
 			case AppPages.History:
 				PageDisplayer.Content = Global.HistoryPage;
 				UnCheckAllButton();
-				CheckButton(HistoryPageBtn, true);
+				HistoryPageBtn.IsChecked = true;
 				break;
 			case AppPages.Status:
 				PageDisplayer.Content = Global.StatusPage;
@@ -466,26 +466,20 @@ private void WifiPasswordsPageBtn_Click(object sender, RoutedEventArgs e)
 	private void HomePageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(HomePageBtn, true);
-
+		HomePageBtn.IsChecked = true;
 		PageDisplayer.Content = Global.HomePage; // Display the home page
 	}
 
 	private void HistoryPageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(HistoryPageBtn, true);
 
 		PageDisplayer.Content = Global.HistoryPage; // Display the history page
 	}
 
 	private void SettingsPageBtn_Click(object sender, RoutedEventArgs e)
 	{
 		LeavePage();
-		UnCheckAllButton(); // Reset all states
-		CheckButton(SettingsPageBtn, true);
 
 		PageDisplayer.Content = Global.SettingsPage;
 	}