diff --git a/e621 ReBot v3/Modules/Downloader/Module_Downloader.cs b/e621 ReBot v3/Modules/Downloader/Module_Downloader.cs index 4aca063..ce65ef4 100644 --- a/e621 ReBot v3/Modules/Downloader/Module_Downloader.cs +++ b/e621 ReBot v3/Modules/Downloader/Module_Downloader.cs @@ -834,6 +834,10 @@ private static void DownloadBGW_Start(object? sender, DoWorkEventArgs e) while (DLThreadsWaiting > 0 && _2Download_DownloadItems.Count > 0) { DownloadItemTemp = _2Download_DownloadItems[0]; + lock (_2Download_DownloadItems) + { + _2Download_DownloadItems.RemoveAt(0); + } DLThreadsWaiting--; if (DownloadItemTemp.Is_e6Download) @@ -844,11 +848,6 @@ private static void DownloadBGW_Start(object? sender, DoWorkEventArgs e) { DownloadFrom_URL(DownloadItemTemp); } - - lock (_2Download_DownloadItems) - { - _2Download_DownloadItems.RemoveAt(0); - } } UpdateDownloadTreeView(); } diff --git a/e621 ReBot v3/Windows/Window_QuickTags.xaml b/e621 ReBot v3/Windows/Window_QuickTags.xaml index d354966..21e5c0c 100644 --- a/e621 ReBot v3/Windows/Window_QuickTags.xaml +++ b/e621 ReBot v3/Windows/Window_QuickTags.xaml @@ -4,7 +4,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" - Title="Quick Tags" Width="256" MinHeight="40" MaxHeight="256" WindowStartupLocation="CenterOwner" Closed="Window_Closed" ShowInTaskbar="False" ResizeMode="NoResize" UseLayoutRounding="True" SnapsToDevicePixels="True" ContentRendered="Window_ContentRendered" KeyDown="Window_KeyDown" SizeToContent="Height"> + Title="Quick Tags" Width="420" MinHeight="40" MaxHeight="512" Closed="Window_Closed" ShowInTaskbar="False" ResizeMode="NoResize" UseLayoutRounding="True" SnapsToDevicePixels="True" ContentRendered="Window_ContentRendered" KeyDown="Window_KeyDown" SizeToContent="Height"> diff --git a/e621 ReBot v3/Windows/Window_QuickTags.xaml.cs b/e621 ReBot v3/Windows/Window_QuickTags.xaml.cs index f11c23f..7f87ebb 100644 --- a/e621 ReBot v3/Windows/Window_QuickTags.xaml.cs +++ b/e621 ReBot v3/Windows/Window_QuickTags.xaml.cs @@ -16,6 +16,10 @@ public Window_QuickTags() InitializeComponent(); App.SetWindow2Square(this); Owner = Window_Tagger._RefHolder; + Point OwnerLocation = Owner.PointToScreen(new Point(0, 0)); + Left = OwnerLocation.X - 8; + Top = OwnerLocation.Y + Owner.Height - 40 + 2; + Window_Tagger.SuggestionPopup.SetTextBoxTarget(QuickTags_TextBox, true); RestorePoolMode = Window_Tagger.SuggestionPopup.PoolMode; Window_Tagger.SuggestionPopup.PoolMode = false; @@ -111,7 +115,7 @@ private void LoadQuickTags() Margin = new Thickness(2, 0, 0, 2), Height = 24, MinWidth = 32, - MaxWidth = 64, + MaxWidth = 128, Content = QuickTagPair.Key, Tag = QuickTagPair.Value, ToolTip = QuickTagPair.Value, @@ -141,5 +145,6 @@ private void QuickTagRemove_ContextMenu_Remove(object sender, RoutedEventArgs e) } LoadQuickTags(); } + } } diff --git a/e621 ReBot v3/e621 ReBot v3.csproj b/e621 ReBot v3/e621 ReBot v3.csproj index 9eb485c..ea77453 100644 --- a/e621 ReBot v3/e621 ReBot v3.csproj +++ b/e621 ReBot v3/e621 ReBot v3.csproj @@ -11,7 +11,7 @@ Resources\ReBot_Icon.ico x64 False - 3.0.0.40 + 3.0.0.41 e621_ReBot_v3.App False https://github.com/e621-ReBot/e621-ReBot-v3