From 29617f423aa340b96bcb7682d12457fb40919033 Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Mon, 15 May 2023 23:50:07 -0400 Subject: [PATCH 1/2] Feature: Changed drive tooltip position --- src/Files.App/Helpers/GitHelpers.cs | 2 +- src/Files.App/UserControls/SidebarControl.xaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Files.App/Helpers/GitHelpers.cs b/src/Files.App/Helpers/GitHelpers.cs index 0a5e0268380c..f831daf5ffbb 100644 --- a/src/Files.App/Helpers/GitHelpers.cs +++ b/src/Files.App/Helpers/GitHelpers.cs @@ -61,7 +61,7 @@ public static async Task Checkout(string? repositoryPath, string? branch) var options = new CheckoutOptions(); var isBringingChanges = false; - Analytics.TrackEvent($"Triggered git checkout"); + Analytics.TrackEvent("Triggered git checkout"); if (repository.RetrieveStatus().IsDirty) { diff --git a/src/Files.App/UserControls/SidebarControl.xaml b/src/Files.App/UserControls/SidebarControl.xaml index 11fc993129b9..20a0defa0c8f 100644 --- a/src/Files.App/UserControls/SidebarControl.xaml +++ b/src/Files.App/UserControls/SidebarControl.xaml @@ -3,13 +3,13 @@ x:Class="Files.App.UserControls.SidebarControl" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:converters="using:Files.App.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:dataitems="using:Files.App.Data.Items" xmlns:helpers="using:Files.App.Helpers" xmlns:local="using:Files.App.UserControls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mconv="using:CommunityToolkit.WinUI.UI.Converters" - xmlns:converters="using:Files.App.Converters" - xmlns:dataitems="using:Files.App.Data.Items" HorizontalAlignment="Stretch" Collapsed="NavigationView_Collapsed" DisplayModeChanged="SidebarControl_DisplayModeChanged" @@ -99,7 +99,7 @@ Tag="{x:Bind Path}" Visibility="{x:Bind ItemVisibility}"> - + Date: Mon, 15 May 2023 23:52:20 -0400 Subject: [PATCH 2/2] Update SidebarControl.xaml --- src/Files.App/UserControls/SidebarControl.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App/UserControls/SidebarControl.xaml b/src/Files.App/UserControls/SidebarControl.xaml index 20a0defa0c8f..593c6044a3ad 100644 --- a/src/Files.App/UserControls/SidebarControl.xaml +++ b/src/Files.App/UserControls/SidebarControl.xaml @@ -99,7 +99,7 @@ Tag="{x:Bind Path}" Visibility="{x:Bind ItemVisibility}"> - +