From e8d8745a2bc2f9b94f45a107efbabfd5c4ae1868 Mon Sep 17 00:00:00 2001
From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com>
Date: Thu, 4 Apr 2024 21:31:17 +0200
Subject: [PATCH] Fix toggle sidebar keybinding and disable content panel when
 laoding

---
 src/Markdowser/ViewModels/MainWindowViewModel.cs | 6 ++++++
 src/Markdowser/Views/MainWindow.axaml            | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Markdowser/ViewModels/MainWindowViewModel.cs b/src/Markdowser/ViewModels/MainWindowViewModel.cs
index 832ed25..cf000cf 100644
--- a/src/Markdowser/ViewModels/MainWindowViewModel.cs
+++ b/src/Markdowser/ViewModels/MainWindowViewModel.cs
@@ -188,6 +188,12 @@ public partial class MainWindowViewModel : ViewModelBase
 
     private void FetchUrl()
     {
+        if (IsBusy)
+        {
+            WindowNotificationManager.Show(new Notification("Busy", "The browser is currently busy.", NotificationType.Warning));
+            return;
+        }
+
         if (string.IsNullOrWhiteSpace(Url))
         {
             Content = DefaultContent;
diff --git a/src/Markdowser/Views/MainWindow.axaml b/src/Markdowser/Views/MainWindow.axaml
index 9e2d882..004a363 100644
--- a/src/Markdowser/Views/MainWindow.axaml
+++ b/src/Markdowser/Views/MainWindow.axaml
@@ -38,7 +38,7 @@
         <KeyBinding Gesture="Alt+Right" Command="{Binding Forward}" />
         <KeyBinding Gesture="Ctrl+T" Command="{Binding NewTab}" />
         <KeyBinding Gesture="Ctrl+W" Command="{Binding CloseTab}" />
-        <KeyBinding Gesture="Alt+S" Command="{Binding ShowSidePanel}" />
+        <KeyBinding Gesture="Alt+S" Command="{Binding ToggleSidePanel}" />
     </Window.KeyBindings>
 
     <Grid RowDefinitions="Auto, *, Auto">
@@ -78,14 +78,14 @@
         </Grid>
 
         <Border Grid.Row="2" BorderThickness="0 2 0 0" CornerRadius="0" BorderBrush="{DynamicResource SemiColorTertiary}">
-            <Grid ColumnDefinitions="Auto, Auto, Auto, Auto, *, Auto">
+            <Grid IsEnabled="{Binding !IsBusy}" ColumnDefinitions="Auto, Auto, Auto, Auto, *, Auto">
                 <Button Grid.Column="0" i:Attached.Icon="fa-solid fa-caret-left" IsEnabled="{Binding BackEnabled}" Command="{Binding Back}" />
                 <Button Grid.Column="1" i:Attached.Icon="fa-solid fa-caret-right" IsEnabled="{Binding ForwardEnabled}" Command="{Binding Forward}" />
                 <Button Grid.Column="2" i:Attached.Icon="fa-solid fa-rotate-right" Command="{Binding Browse}" />
                 <Button Grid.Column="3" i:Attached.Icon="fa-solid fa-house" Command="{StaticResource HomeCommand}" />
 
                 <Grid Grid.Column="4">
-                    <TextBox x:Name="urlBar" IsVisible="{Binding !IsBusy}" Watermark="Search DuckDuckGo or type a URL" Text="{Binding Url}" BorderThickness="0">
+                    <TextBox IsVisible="{Binding !IsBusy}" Watermark="Search DuckDuckGo or type a URL" Text="{Binding Url}" BorderThickness="0">
                         <TextBox.KeyBindings>
                             <KeyBinding Gesture="Enter" Command="{Binding Browse}" />
                         </TextBox.KeyBindings>