From ed9f88870c385d9af8b9b04833731707393f991d Mon Sep 17 00:00:00 2001 From: William-Hiatt Date: Mon, 6 Nov 2023 14:40:16 -0800 Subject: [PATCH 1/5] Tool tip issue is fixed and now displays open repo in VS code. --- src/Files.App/UserControls/StatusBarControl.xaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Files.App/UserControls/StatusBarControl.xaml b/src/Files.App/UserControls/StatusBarControl.xaml index b3ce5455b2da..1535933b0aa6 100644 --- a/src/Files.App/UserControls/StatusBarControl.xaml +++ b/src/Files.App/UserControls/StatusBarControl.xaml @@ -188,12 +188,14 @@ x:Name="OpenFolderInVSCodeButton" Command="{x:Bind Commands.OpenInVSCode}" KeyboardAcceleratorTextOverride="{x:Bind Commands.OpenInVSCode.HotKeys, Mode=OneWay}" - Text="{x:Bind Commands.OpenInVSCode.Label, Mode=OneWay}" /> + Text="{x:Bind Commands.OpenInVSCode.Label, Mode=OneWay}" + ToolTipService.ToolTip="{x:Bind Commands.OpenInVSCode.LabelWithHotKey, Mode=OneWay}"/> From 85028d08895617a1e01d16c46b1eac388dd4b84a Mon Sep 17 00:00:00 2001 From: William-Hiatt Date: Mon, 6 Nov 2023 14:49:37 -0800 Subject: [PATCH 2/5] Fixed possible formatting issue with XAML --- src/Files.App/UserControls/StatusBarControl.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App/UserControls/StatusBarControl.xaml b/src/Files.App/UserControls/StatusBarControl.xaml index 1535933b0aa6..11a80baa44bf 100644 --- a/src/Files.App/UserControls/StatusBarControl.xaml +++ b/src/Files.App/UserControls/StatusBarControl.xaml @@ -189,7 +189,7 @@ Command="{x:Bind Commands.OpenInVSCode}" KeyboardAcceleratorTextOverride="{x:Bind Commands.OpenInVSCode.HotKeys, Mode=OneWay}" Text="{x:Bind Commands.OpenInVSCode.Label, Mode=OneWay}" - ToolTipService.ToolTip="{x:Bind Commands.OpenInVSCode.LabelWithHotKey, Mode=OneWay}"/> + ToolTipService.ToolTip="{x:Bind Commands.OpenInVSCode.LabelWithHotKey, Mode=OneWay}" /> Date: Mon, 6 Nov 2023 14:51:45 -0800 Subject: [PATCH 3/5] Fixed command. --- src/Files.App/UserControls/StatusBarControl.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App/UserControls/StatusBarControl.xaml b/src/Files.App/UserControls/StatusBarControl.xaml index 11a80baa44bf..bd9f965da104 100644 --- a/src/Files.App/UserControls/StatusBarControl.xaml +++ b/src/Files.App/UserControls/StatusBarControl.xaml @@ -189,7 +189,7 @@ Command="{x:Bind Commands.OpenInVSCode}" KeyboardAcceleratorTextOverride="{x:Bind Commands.OpenInVSCode.HotKeys, Mode=OneWay}" Text="{x:Bind Commands.OpenInVSCode.Label, Mode=OneWay}" - ToolTipService.ToolTip="{x:Bind Commands.OpenInVSCode.LabelWithHotKey, Mode=OneWay}" /> + ToolTipService.ToolTip="{x:Bind Commands.OpenRepoInVSCode.LabelWithHotKey, Mode=OneWay}" /> Date: Mon, 6 Nov 2023 17:56:10 -0500 Subject: [PATCH 4/5] Update StatusBarControl.xaml --- src/Files.App/UserControls/StatusBarControl.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Files.App/UserControls/StatusBarControl.xaml b/src/Files.App/UserControls/StatusBarControl.xaml index bd9f965da104..8d15d4c0bdfc 100644 --- a/src/Files.App/UserControls/StatusBarControl.xaml +++ b/src/Files.App/UserControls/StatusBarControl.xaml @@ -189,13 +189,13 @@ Command="{x:Bind Commands.OpenInVSCode}" KeyboardAcceleratorTextOverride="{x:Bind Commands.OpenInVSCode.HotKeys, Mode=OneWay}" Text="{x:Bind Commands.OpenInVSCode.Label, Mode=OneWay}" - ToolTipService.ToolTip="{x:Bind Commands.OpenRepoInVSCode.LabelWithHotKey, Mode=OneWay}" /> + ToolTipService.ToolTip="{x:Bind Commands.OpenInVSCode.LabelWithHotKey, Mode=OneWay}" /> From e95689145de06264afd7aa4dd3c3db5c1441354b Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Mon, 6 Nov 2023 17:57:22 -0500 Subject: [PATCH 5/5] Fix issue where open repo in VS Code was sometimes hidden --- src/Files.App/UserControls/StatusBarControl.xaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Files.App/UserControls/StatusBarControl.xaml b/src/Files.App/UserControls/StatusBarControl.xaml index 8d15d4c0bdfc..c596e9889719 100644 --- a/src/Files.App/UserControls/StatusBarControl.xaml +++ b/src/Files.App/UserControls/StatusBarControl.xaml @@ -195,8 +195,7 @@ Command="{x:Bind Commands.OpenRepoInVSCode}" KeyboardAcceleratorTextOverride="{x:Bind Commands.OpenRepoInVSCode.HotKeys, Mode=OneWay}" Text="{x:Bind Commands.OpenRepoInVSCode.Label, Mode=OneWay}" - ToolTipService.ToolTip="{x:Bind Commands.OpenRepoInVSCode.LabelWithHotKey, Mode=OneWay}" - Visibility="{x:Bind Commands.OpenRepoInVSCode.IsExecutable, Mode=OneWay}" /> + ToolTipService.ToolTip="{x:Bind Commands.OpenRepoInVSCode.LabelWithHotKey, Mode=OneWay}" />