From e85a99f8d641c79250ba8ec9f3ad24e67888f05b Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 13 Oct 2021 08:22:12 +1100
Subject: [PATCH 1/4] fix custom browser setting window positioning of controls

---
 .../Views/CustomBrowserSetting.xaml           | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
index e13663a8d94..8c77c5ec27b 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Flow.Launcher.Plugin.BrowserBookmark.Models"
         mc:Ignorable="d"
-        Title="CustomBrowserSetting" Height="450" Width="600"
+        WindowStartupLocation="CenterScreen"
+        Title="CustomBrowserSetting" Height="350" Width="600"
         KeyDown="WindowKeyDown"
         >
     <Window.DataContext>
@@ -13,23 +14,23 @@
     </Window.DataContext>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition/>
-            <RowDefinition/>
-            <RowDefinition/>
+            <RowDefinition Height="100"/>
+            <RowDefinition Height="100"/>
+            <RowDefinition Height="60"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="4*"/>
             <ColumnDefinition Width="6*"/>
         </Grid.ColumnDefinitions>
         <TextBlock Grid.Row="0" Grid.Column="0" Text="Browser Name" FontSize="15" 
-                   HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                   HorizontalAlignment="Left" VerticalAlignment="Center" Margin="80 0 0 0"/>
         <TextBlock Grid.Row="1" Grid.Column="0" Text="Browser Data Directory Path" FontSize="15" 
-                   HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                   HorizontalAlignment="Left" VerticalAlignment="Center" Margin="80 0 0 0"/>
         <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Name}"
-                   HorizontalAlignment="Left" VerticalAlignment="Center" Width="100" Height="30"/>
+                   HorizontalAlignment="Left" VerticalAlignment="Center" Width="100" Height="30" Margin="50 0 0 0"/>
         <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding DataDirectoryPath}"
-                   HorizontalAlignment="Left" VerticalAlignment="Center" Width="200" Height="30"/>
-        <StackPanel HorizontalAlignment="Right" Grid.Row="2" Orientation="Horizontal" Grid.Column="1" Height="60">
+                   HorizontalAlignment="Left" VerticalAlignment="Center" Width="200" Height="30" Margin="50 0 0 0"/>
+        <StackPanel HorizontalAlignment="Center" Grid.Row="2" Orientation="Horizontal" Grid.Column="1" Height="70">
             <Button Content="Confirm" Margin="15" Click="ConfirmEditCustomBrowser"/>
             <Button Content="Cancel" Margin="15"/>
         </StackPanel>

From 7b70386936a33d35e882181732454d35df8dbe38 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 13 Oct 2021 08:27:10 +1100
Subject: [PATCH 2/4] fix bookmark plugin settings button width

---
 .../Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml  | 4 ++--
 .../Views/SettingsControl.xaml                              | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
index 10abea6daf6..ab854b8ed3a 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
@@ -17,6 +17,6 @@
     <system:String x:Key="flowlauncher_plugin_browserbookmark_loadBrowserFrom">Load Browser From:</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browserName">Browser Name</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory">DataDirectoryPath</system:String>
-    <system:String x:Key="flowlauncher_plugin_browserbookmark_addBrowserBookmark">Add Custom Browser Bookmark</system:String>
-    <system:String x:Key="flowlauncher_plugin_browserbookmark_removeBrowserBookmark">Delete Custom Browser Bookmark</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_addBrowserBookmark">Add</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_removeBrowserBookmark">Delete</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 46b6a05449e..7b7ccbeea29 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -63,8 +63,10 @@
                 </ListView.View>
             </ListView>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                <Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" Margin="10" Click="NewCustomBrowser"/>
-                <Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" Margin="10" Click="DeleteCustomBrowser"/>
+                <Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" 
+                        Margin="10" Click="NewCustomBrowser" Width="80" />
+                <Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" 
+                        Margin="10" Click="DeleteCustomBrowser" Width="80"/>
             </StackPanel>
         </StackPanel>
     </Grid>

From db3099ed0efb4f374e7e8e3c0f83c6384716bd29 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 13 Oct 2021 09:07:27 +1100
Subject: [PATCH 3/4] fix bookmark plugin browser edit button logic

---
 .../Views/CustomBrowserSetting.xaml              |  4 ++--
 .../Views/CustomBrowserSetting.xaml.cs           | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
index 8c77c5ec27b..ff3fbb38e6e 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
@@ -31,8 +31,8 @@
         <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding DataDirectoryPath}"
                    HorizontalAlignment="Left" VerticalAlignment="Center" Width="200" Height="30" Margin="50 0 0 0"/>
         <StackPanel HorizontalAlignment="Center" Grid.Row="2" Orientation="Horizontal" Grid.Column="1" Height="70">
-            <Button Content="Confirm" Margin="15" Click="ConfirmEditCustomBrowser"/>
-            <Button Content="Cancel" Margin="15"/>
+            <Button Name="btnConfirm" Content="Confirm" Margin="15" Click="ConfirmCancelEditCustomBrowser"/>
+            <Button Content="Cancel" Margin="15" Click="ConfirmCancelEditCustomBrowser"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
index 8ec9e3a6483..b243878f7de 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs
@@ -31,20 +31,26 @@ public CustomBrowserSettingWindow(CustomBrowser browser)
             };
         }
 
-        private void ConfirmEditCustomBrowser(object sender, RoutedEventArgs e)
+        private void ConfirmCancelEditCustomBrowser(object sender, RoutedEventArgs e)
         {
-            if (DataContext is CustomBrowser editedBrowser)
+            if (DataContext is CustomBrowser editBrowser && e.Source is Button button)
             {
-                currentCustomBrowser.Name = editedBrowser.Name;
-                currentCustomBrowser.DataDirectoryPath = editedBrowser.DataDirectoryPath;
+                if (button.Name == "btnConfirm")
+                {
+                    currentCustomBrowser.Name = editBrowser.Name;
+                    currentCustomBrowser.DataDirectoryPath = editBrowser.DataDirectoryPath;
+                    Close();
+                }
             }
+
             Close();
         }
+
         private void WindowKeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Enter)
             {
-                ConfirmEditCustomBrowser(sender, e);
+                ConfirmCancelEditCustomBrowser(sender, e);
             }
         }
     }

From c7c5990c2e12846667fb2031aece8acb6ee0faf0 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Wed, 13 Oct 2021 21:49:26 +1100
Subject: [PATCH 4/4] fix edge bookmark loading

---
 .../ChromeBookmarkLoader.cs                   |  2 +-
 .../EdgeBookmarkLoader.cs                     | 21 +++++++------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromeBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromeBookmarkLoader.cs
index d7cfcaf6a41..ec6f8423d3c 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromeBookmarkLoader.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromeBookmarkLoader.cs
@@ -17,7 +17,7 @@ public override List<Bookmark> GetBookmarks()
         private List<Bookmark> LoadChromeBookmarks()
         {
             var bookmarks = new List<Bookmark>();
-            String platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            var platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
             bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Google\Chrome\User Data"), "Google Chrome"));
             bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Google\Chrome SxS\User Data"), "Google Chrome Canary"));
             bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Chromium\User Data"), "Chromium"));
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/EdgeBookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/EdgeBookmarkLoader.cs
index d982ee99e59..276f6368e9f 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/EdgeBookmarkLoader.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/EdgeBookmarkLoader.cs
@@ -10,22 +10,17 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
 {
     public class EdgeBookmarkLoader : ChromiumBookmarkLoader
     {
-
-        private readonly List<Bookmark> _bookmarks = new();
-
-        private void LoadEdgeBookmarks()
+        private List<Bookmark> LoadEdgeBookmarks()
         {
+            var bookmarks = new List<Bookmark>();
             var platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
-            LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge\User Data"), "Microsoft Edge");
-            LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge Dev\User Data"), "Microsoft Edge Dev");
-            LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge SxS\User Data"), "Microsoft Edge Canary");
+            bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge\User Data"), "Microsoft Edge"));
+            bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge Dev\User Data"), "Microsoft Edge Dev"));
+            bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge SxS\User Data"), "Microsoft Edge Canary"));
+
+            return bookmarks;
         }
         
-        public override List<Bookmark> GetBookmarks()
-        {
-            _bookmarks.Clear();
-            LoadEdgeBookmarks();
-            return _bookmarks;
-        }
+        public override List<Bookmark> GetBookmarks() => LoadEdgeBookmarks();
     }
 }
\ No newline at end of file