From 8a59e87f997db2f4991de4786c5e2aa5bd7272d5 Mon Sep 17 00:00:00 2001
From: Kevin Zhang <hongtao_zhang@outlook.com>
Date: Mon, 25 Oct 2021 18:51:34 -0500
Subject: [PATCH] Fix unselected issue for bookmark plugin by using binding
 (Don't understand Reason it doesn't work before)

---
 .../Views/SettingsControl.xaml                | 12 ++++----
 .../Views/SettingsControl.xaml.cs             | 30 +++++++++++--------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 7b7ccbeea..abe1f0ad5 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -22,12 +22,12 @@
                 </Grid.ColumnDefinitions>
                 <Label Grid.Column="0" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_openBookmarks}"
                        FontSize="15" Margin="10 5 0 0"/>
-                <RadioButton Grid.Column="1" Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" 
-                             Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newWindow}"
-                             Click="OnNewBrowserWindowClick" />
-                <RadioButton Grid.Column="2" Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" 
-                             Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newTab}" 
-                             Click="OnNewTabClick" />
+                <RadioButton Grid.Column="1" Name="NewWindowBrowser"
+                             IsChecked="{Binding OpenInNewBrowserWindow}"
+                             Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newWindow}"/>
+                <RadioButton Grid.Column="2" Name="NewTabInBrowser"
+                             IsChecked="{Binding OpenInNewTab, Mode=OneTime}"
+                             Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newTab}"/>
             </Grid>
         </StackPanel>
         <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Grid.Row="1" Height="60" Margin="30,20,0,0">
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
index 2f67b999c..56fa58acf 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
@@ -3,34 +3,38 @@ using System.Windows;
 using System.Windows.Controls;
 using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using System.Windows.Input;
+using System.ComponentModel;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views
 {
     /// <summary>
     /// Interaction logic for BrowserBookmark.xaml
     /// </summary>
-    public partial class SettingsControl
+    public partial class SettingsControl : INotifyPropertyChanged
     {
         public Settings Settings { get; }
         public CustomBrowser SelectedCustomBrowser { get; set; }
+        public bool OpenInNewBrowserWindow
+        {
+            get => Settings.OpenInNewBrowserWindow;
+            set
+            {
+                Settings.OpenInNewBrowserWindow = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OpenInNewBrowserWindow)));
+            }
+        }
+        public bool OpenInNewTab
+        {
+            get => !OpenInNewBrowserWindow;
+        }
 
         public SettingsControl(Settings settings)
         {
             Settings = settings;
             InitializeComponent();
-            NewWindowBrowser.IsChecked = Settings.OpenInNewBrowserWindow;
-            NewTabInBrowser.IsChecked = !Settings.OpenInNewBrowserWindow;
         }
 
-        private void OnNewBrowserWindowClick(object sender, RoutedEventArgs e)
-        {
-            Settings.OpenInNewBrowserWindow = true;
-        }
-
-        private void OnNewTabClick(object sender, RoutedEventArgs e)
-        {
-            Settings.OpenInNewBrowserWindow = false;
-        }
+        public event PropertyChangedEventHandler PropertyChanged;
 
         private void OnChooseClick(object sender, RoutedEventArgs e)
         {
@@ -61,7 +65,7 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Views
 
         private void DeleteCustomBrowser(object sender, RoutedEventArgs e)
         {
-            if(CustomBrowsers.SelectedItem is CustomBrowser selectedCustomBrowser)
+            if (CustomBrowsers.SelectedItem is CustomBrowser selectedCustomBrowser)
             {
                 Settings.CustomChromiumBrowsers.Remove(selectedCustomBrowser);
             }