Skip to content

Commit f6f306e

Browse files
jjw24jjw24
authored
Merge pull request #751 from Flow-Launcher/fix_bookmark_plugin_window_size
Dev: Fix Bookmark plugin settings browser edit
2 parents 2a68a41 + c7c5990 commit f6f306e

File tree

6 files changed

+38
-34
lines changed

6 files changed

+38
-34
lines changed

‎Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromeBookmarkLoader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public override List<Bookmark> GetBookmarks()
1717
private List<Bookmark> LoadChromeBookmarks()
1818
{
1919
var bookmarks = new List<Bookmark>();
20-
String platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
20+
var platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
2121
bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Google\Chrome\User Data"), "Google Chrome"));
2222
bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Google\Chrome SxS\User Data"), "Google Chrome Canary"));
2323
bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Chromium\User Data"), "Chromium"));

‎Plugins/Flow.Launcher.Plugin.BrowserBookmark/EdgeBookmarkLoader.cs

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,17 @@ namespace Flow.Launcher.Plugin.BrowserBookmark
1010
{
1111
public class EdgeBookmarkLoader : ChromiumBookmarkLoader
1212
{
13-
14-
private readonly List<Bookmark> _bookmarks = new();
15-
16-
private void LoadEdgeBookmarks()
13+
private List<Bookmark> LoadEdgeBookmarks()
1714
{
15+
var bookmarks = new List<Bookmark>();
1816
var platformPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
19-
LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge\User Data"), "Microsoft Edge");
20-
LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge Dev\User Data"), "Microsoft Edge Dev");
21-
LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge SxS\User Data"), "Microsoft Edge Canary");
17+
bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge\User Data"), "Microsoft Edge"));
18+
bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge Dev\User Data"), "Microsoft Edge Dev"));
19+
bookmarks.AddRange(LoadBookmarks(Path.Combine(platformPath, @"Microsoft\Edge SxS\User Data"), "Microsoft Edge Canary"));
20+
21+
return bookmarks;
2222
}
2323

24-
public override List<Bookmark> GetBookmarks()
25-
{
26-
_bookmarks.Clear();
27-
LoadEdgeBookmarks();
28-
return _bookmarks;
29-
}
24+
public override List<Bookmark> GetBookmarks() => LoadEdgeBookmarks();
3025
}
3126
}

‎Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<system:String x:Key="flowlauncher_plugin_browserbookmark_loadBrowserFrom">Load Browser From:</system:String>
1818
<system:String x:Key="flowlauncher_plugin_browserbookmark_browserName">Browser Name</system:String>
1919
<system:String x:Key="flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory">DataDirectoryPath</system:String>
20-
<system:String x:Key="flowlauncher_plugin_browserbookmark_addBrowserBookmark">Add Custom Browser Bookmark</system:String>
21-
<system:String x:Key="flowlauncher_plugin_browserbookmark_removeBrowserBookmark">Delete Custom Browser Bookmark</system:String>
20+
<system:String x:Key="flowlauncher_plugin_browserbookmark_addBrowserBookmark">Add</system:String>
21+
<system:String x:Key="flowlauncher_plugin_browserbookmark_removeBrowserBookmark">Delete</system:String>
2222
</ResourceDictionary>

‎Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,34 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:Flow.Launcher.Plugin.BrowserBookmark.Models"
77
mc:Ignorable="d"
8-
Title="CustomBrowserSetting" Height="450" Width="600"
8+
WindowStartupLocation="CenterScreen"
9+
Title="CustomBrowserSetting" Height="350" Width="600"
910
KeyDown="WindowKeyDown"
1011
>
1112
<Window.DataContext>
1213
<local:CustomBrowser/>
1314
</Window.DataContext>
1415
<Grid>
1516
<Grid.RowDefinitions>
16-
<RowDefinition/>
17-
<RowDefinition/>
18-
<RowDefinition/>
17+
<RowDefinition Height="100"/>
18+
<RowDefinition Height="100"/>
19+
<RowDefinition Height="60"/>
1920
</Grid.RowDefinitions>
2021
<Grid.ColumnDefinitions>
2122
<ColumnDefinition Width="4*"/>
2223
<ColumnDefinition Width="6*"/>
2324
</Grid.ColumnDefinitions>
2425
<TextBlock Grid.Row="0" Grid.Column="0" Text="Browser Name" FontSize="15"
25-
HorizontalAlignment="Left" VerticalAlignment="Center"/>
26+
HorizontalAlignment="Left" VerticalAlignment="Center" Margin="80 0 0 0"/>
2627
<TextBlock Grid.Row="1" Grid.Column="0" Text="Browser Data Directory Path" FontSize="15"
27-
HorizontalAlignment="Left" VerticalAlignment="Center"/>
28+
HorizontalAlignment="Left" VerticalAlignment="Center" Margin="80 0 0 0"/>
2829
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Name}"
29-
HorizontalAlignment="Left" VerticalAlignment="Center" Width="100" Height="30"/>
30+
HorizontalAlignment="Left" VerticalAlignment="Center" Width="100" Height="30" Margin="50 0 0 0"/>
3031
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding DataDirectoryPath}"
31-
HorizontalAlignment="Left" VerticalAlignment="Center" Width="200" Height="30"/>
32-
<StackPanel HorizontalAlignment="Right" Grid.Row="2" Orientation="Horizontal" Grid.Column="1" Height="60">
33-
<Button Content="Confirm" Margin="15" Click="ConfirmEditCustomBrowser"/>
34-
<Button Content="Cancel" Margin="15"/>
32+
HorizontalAlignment="Left" VerticalAlignment="Center" Width="200" Height="30" Margin="50 0 0 0"/>
33+
<StackPanel HorizontalAlignment="Center" Grid.Row="2" Orientation="Horizontal" Grid.Column="1" Height="70">
34+
<Button Name="btnConfirm" Content="Confirm" Margin="15" Click="ConfirmCancelEditCustomBrowser"/>
35+
<Button Content="Cancel" Margin="15" Click="ConfirmCancelEditCustomBrowser"/>
3536
</StackPanel>
3637
</Grid>
3738
</Window>

‎Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,26 @@ public CustomBrowserSettingWindow(CustomBrowser browser)
3131
};
3232
}
3333

34-
private void ConfirmEditCustomBrowser(object sender, RoutedEventArgs e)
34+
private void ConfirmCancelEditCustomBrowser(object sender, RoutedEventArgs e)
3535
{
36-
if (DataContext is CustomBrowser editedBrowser)
36+
if (DataContext is CustomBrowser editBrowser && e.Source is Button button)
3737
{
38-
currentCustomBrowser.Name = editedBrowser.Name;
39-
currentCustomBrowser.DataDirectoryPath = editedBrowser.DataDirectoryPath;
38+
if (button.Name == "btnConfirm")
39+
{
40+
currentCustomBrowser.Name = editBrowser.Name;
41+
currentCustomBrowser.DataDirectoryPath = editBrowser.DataDirectoryPath;
42+
Close();
43+
}
4044
}
45+
4146
Close();
4247
}
48+
4349
private void WindowKeyDown(object sender, KeyEventArgs e)
4450
{
4551
if (e.Key == Key.Enter)
4652
{
47-
ConfirmEditCustomBrowser(sender, e);
53+
ConfirmCancelEditCustomBrowser(sender, e);
4854
}
4955
}
5056
}

‎Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@
6363
</ListView.View>
6464
</ListView>
6565
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
66-
<Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" Margin="10" Click="NewCustomBrowser"/>
67-
<Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" Margin="10" Click="DeleteCustomBrowser"/>
66+
<Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}"
67+
Margin="10" Click="NewCustomBrowser" Width="80" />
68+
<Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}"
69+
Margin="10" Click="DeleteCustomBrowser" Width="80"/>
6870
</StackPanel>
6971
</StackPanel>
7072
</Grid>

0 commit comments

Comments
 (0)