Make focusing on lookup true by default.

Bump version number.
rampaa · Mar 13, 2022 · 83317b5 · 83317b5
1 parent 2266399
commit 83317b5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/JL/ConfigManager.cs b/JL/ConfigManager.cs
@@ -71,7 +71,7 @@ public static class ConfigManager
         public static int PopupMaxHeight { get; set; } = 520;
         public static bool PopupDynamicHeight { get; set; } = true;
         public static bool PopupDynamicWidth { get; set; } = true;
-        public static bool PopupFocusOnLookup { get; set; } = false;
+        public static bool PopupFocusOnLookup { get; set; } = true;
         public static int PopupXOffset { get; set; } = 10;
         public static int PopupYOffset { get; set; } = 20;
         public static bool PopupFlipX { get; set; } = true;

diff --git a/JL/GUI/PopupWindow.xaml.cs b/JL/GUI/PopupWindow.xaml.cs
@@ -19,7 +19,7 @@ namespace JL.GUI
     /// </summary>
     public partial class PopupWindow : Window
     {
-        private readonly PopupWindow _parentPopUp;
+        private readonly PopupWindow _parentPopupWindow;
 
         private PopupWindow _childPopupWindow;
 
@@ -53,7 +53,7 @@ public PopupWindow()
 
         public PopupWindow(PopupWindow parentPopUp) : this()
         {
-            _parentPopUp = parentPopUp;
+            _parentPopupWindow = parentPopUp;
         }
 
         public void Init()
@@ -1037,7 +1037,7 @@ private async void Window_KeyDown(object sender, KeyEventArgs e)
                 PopUpScrollViewer.ScrollToTop();
                 PopUpScrollViewer.VerticalScrollBarVisibility = ScrollBarVisibility.Disabled;
 
-                if (ConfigManager.LookupOnSelectOnly && _parentPopUp == null)
+                if (ConfigManager.LookupOnSelectOnly && _parentPopupWindow == null)
                 {
                     Unselect(MainWindow.Instance.MainTextBox);
                 }

diff --git a/JL/Storage.cs b/JL/Storage.cs
@@ -22,7 +22,7 @@ public class Storage
     {
         public static readonly string ApplicationPath = Directory.GetCurrentDirectory();
         public static readonly HttpClient Client = new(new HttpClientHandler() { UseProxy = false });
-        public static readonly Version Version = new(1, 4);
+        public static readonly Version Version = new(1, 5);
         public static readonly string RepoUrl = "https://github.com/rampaa/JL/";
         public static bool Ready { get; set; } = false;
         public static bool UpdatingJMdict { get; set; } = false;
@@ -70,7 +70,9 @@ public class Storage
 
         public static readonly List<DictType> NazekaDictTypes = new()
         {
-            DictType.KenkyuushaNazeka, DictType.DaijirinNazeka, DictType.ShinmeikaiNazeka
+            DictType.KenkyuushaNazeka,
+            DictType.DaijirinNazeka,
+            DictType.ShinmeikaiNazeka
         };
 
         public static async Task LoadDictionaries()