Close flyout

files-community · May 11, 2023 · 35d7202 · 35d7202
1 parent 720acaa
commit 35d7202
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Files.App/UserControls/StatusBarControl.xaml b/src/Files.App/UserControls/StatusBarControl.xaml
@@ -61,7 +61,7 @@
 				BorderThickness="0"
 				Content="{x:Bind DirectoryPropertiesViewModel.GitBranchDisplayName, Mode=OneWay}">
 				<Button.Flyout>
-					<Flyout Opening="Flyout_Opening">
+					<Flyout x:Name="GitBranchesFlyout" Opening="Flyout_Opening">
 						<Grid
 							Width="300"
 							Height="340"
@@ -98,9 +98,11 @@
 
 							<!--  Branches List  -->
 							<ListView
+								x:Name="BranchesListView"
 								Grid.Row="1"
 								Padding="4"
 								Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+								ItemClick="BranchesListView_ItemClick"
 								ItemsSource="{x:Bind DirectoryPropertiesViewModel.BranchesNames, Mode=OneWay}"
 								SelectedIndex="{x:Bind DirectoryPropertiesViewModel.SelectedBranchIndex, Mode=TwoWay}"
 								SelectionMode="Single" />

diff --git a/src/Files.App/UserControls/StatusBarControl.xaml.cs b/src/Files.App/UserControls/StatusBarControl.xaml.cs
@@ -48,5 +48,10 @@ private void Flyout_Opening(object sender, object e)
 		{
 			DirectoryPropertiesViewModel.SelectedBranchIndex = DirectoryPropertiesViewModel.ActiveBranchIndex;
 		}
+
+		private void BranchesListView_ItemClick(object sender, ItemClickEventArgs e)
+		{
+			GitBranchesFlyout.Hide();
+		}
 	}
 }