From 205b5052426fc535dfbd69e91036aeeeba3c11df Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Mon, 11 Nov 2019 22:29:15 +1100
Subject: [PATCH] Browser bookmarks update display and remove apply button

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

diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index d0f5dfc015..2b28967584 100644
--- a/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -6,22 +6,20 @@
              mc:Ignorable="d"
              Background="White"
              d:DesignHeight="300" d:DesignWidth="500">
-    <Grid Margin="10">
+    <Grid Margin="10,10,10,0">
         <Grid.RowDefinitions>
             <RowDefinition Height="40" />
             <RowDefinition />
-            <RowDefinition Height="40" />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" Grid.Row="0">
             <Label Content="Open bookmark in:" Margin="40 3 0 8"/>
             <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="New window" Click="OnNewBrowserWindowClick" Margin="10" />
             <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="New tab" Click="OnNewTabClick" Margin="10" />
         </StackPanel>
-        <StackPanel VerticalAlignment="Center" Margin="0,50,0,44" Grid.Row="1">
-            <Label Content="Set browser from path:" Height="28" Margin="0,0,155,0" HorizontalAlignment="Right" Width="290"/>
-            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="34" Margin="35,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668"/>
-            <Button x:Name="setButton" HorizontalAlignment="Left" Margin="272,5,0,0" Width="73" Height="25" FontSize="10" Click="OnApplyBTClick" Content="Apply" />
-            <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="180,-25,0,0" Width="73" Height="25" Click="OnChooseClick" FontSize="10" Content="Choose" />
+        <StackPanel VerticalAlignment="Top" Grid.Row="1" Height="106" Margin="41,13,0,0">
+            <Label Content="Set browser from path:" Height="28" Margin="0,0,155,0" HorizontalAlignment="Left" Width="290"/>
+            <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Height="28" Margin="5,0,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="311" RenderTransformOrigin="0.502,-1.668"/>
+            <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="340,-28,-1,0" Width="100" Height="28" Click="OnChooseClick" FontSize="10" Content="Choose" />
         </StackPanel>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
index b257fe1d4c..60056ae31a 100644
--- a/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
+++ b/Plugins/Wox.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs
@@ -30,11 +30,6 @@ namespace Wox.Plugin.BrowserBookmark.Views
             _settings.OpenInNewBrowserWindow = false;
         }
 
-        private void OnApplyBTClick(object sender, RoutedEventArgs e)
-        {
-            _settings.BrowserPath = browserPathBox.Text;
-        }
-
         private void OnChooseClick(object sender, RoutedEventArgs e)
         {
             var fileBrowserDialog = new OpenFileDialog();
@@ -44,6 +39,7 @@ namespace Wox.Plugin.BrowserBookmark.Views
             if (fileBrowserDialog.ShowDialog() == true)
             {
                 browserPathBox.Text = fileBrowserDialog.FileName;
+                _settings.BrowserPath = fileBrowserDialog.FileName;
             }
         }
     }