Fix "Always on top" option not taking effect correctly

rampaa · Dec 30, 2022 · c39dad8 · c39dad8
1 parent cc6f29e
commit c39dad8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/JL.Windows/ConfigManager.cs b/JL.Windows/ConfigManager.cs
@@ -173,6 +173,8 @@ public void ApplyPreferences()
         Precaching = GetValueFromConfig(Precaching, nameof(Precaching), bool.TryParse);
         CheckForJLUpdatesOnStartUp = GetValueFromConfig(CheckForJLUpdatesOnStartUp, nameof(CheckForJLUpdatesOnStartUp), bool.TryParse);
         AlwaysOnTop = GetValueFromConfig(AlwaysOnTop, nameof(AlwaysOnTop), bool.TryParse);
+        mainWindow.Topmost = AlwaysOnTop;
+
         RequireLookupKeyPress = GetValueFromConfig(RequireLookupKeyPress, nameof(RequireLookupKeyPress), bool.TryParse);
         DisableHotkeys = GetValueFromConfig(DisableHotkeys, nameof(DisableHotkeys), bool.TryParse);
         Focusable = GetValueFromConfig(Focusable, nameof(Focusable), bool.TryParse);
@@ -193,8 +195,6 @@ public void ApplyPreferences()
         DisableLookupsForNonJapaneseCharsInMainWindow = GetValueFromConfig(DisableLookupsForNonJapaneseCharsInMainWindow, nameof(DisableLookupsForNonJapaneseCharsInMainWindow), bool.TryParse);
         MainWindowDynamicHeight = GetValueFromConfig(MainWindowDynamicHeight, nameof(MainWindowDynamicHeight), bool.TryParse);
         MainWindowDynamicWidth = GetValueFromConfig(MainWindowDynamicWidth, nameof(MainWindowDynamicWidth), bool.TryParse);
-        TextBoxIsReadOnly = GetValueFromConfig(TextBoxIsReadOnly, nameof(TextBoxIsReadOnly), bool.TryParse);
-        TextBoxIsReadOnly = GetValueFromConfig(TextBoxIsReadOnly, nameof(TextBoxIsReadOnly), bool.TryParse);
         PopupDynamicHeight = GetValueFromConfig(PopupDynamicHeight, nameof(PopupDynamicHeight), bool.TryParse);
         PopupDynamicWidth = GetValueFromConfig(PopupDynamicWidth, nameof(PopupDynamicWidth), bool.TryParse);
 
@@ -611,10 +611,21 @@ public void LoadPreferences(PreferencesWindow preferenceWindow)
         preferenceWindow.MainWindowFontComboBox.SelectedIndex = s_japaneseFonts.FindIndex(f =>
             f.Content.ToString() == mainWindow.MainTextBox.FontFamily.Source);
 
+        if (preferenceWindow.MainWindowFontComboBox.SelectedIndex == -1)
+        {
+            preferenceWindow.MainWindowFontComboBox.SelectedIndex = 0;
+        }
+
+
         preferenceWindow.PopupFontComboBox.ItemsSource = s_popupJapaneseFonts;
         preferenceWindow.PopupFontComboBox.SelectedIndex =
             s_popupJapaneseFonts.FindIndex(f => f.Content.ToString() == PopupFont.Source);
 
+        if (preferenceWindow.PopupFontComboBox.SelectedIndex == -1)
+        {
+            preferenceWindow.PopupFontComboBox.SelectedIndex = 0;
+        }
+
         preferenceWindow.PopupMaxHeightNumericUpDown.Maximum = WindowsUtils.ActiveScreen.Bounds.Height;
         preferenceWindow.PopupMaxWidthNumericUpDown.Maximum = WindowsUtils.ActiveScreen.Bounds.Width;
 

diff --git a/JL.Windows/GUI/MainWindow.xaml.cs b/JL.Windows/GUI/MainWindow.xaml.cs
@@ -779,7 +779,7 @@ private void DisplaySettingsChanged(object? sender, EventArgs? e)
     private void Window_DpiChanged(object sender, DpiChangedEventArgs e)
     {
         WindowsUtils.Dpi = e.NewDpi;
-        WindowsUtils.ActiveScreen = System.Windows.Forms.Screen.FromHandle(new WindowInteropHelper(this).Handle);
+        WindowsUtils.ActiveScreen = System.Windows.Forms.Screen.FromHandle(WindowHandle);
         WindowsUtils.DpiAwareWorkAreaWidth = WindowsUtils.ActiveScreen.Bounds.Width / e.NewDpi.DpiScaleX;
         WindowsUtils.DpiAwareWorkAreaHeight = WindowsUtils.ActiveScreen.Bounds.Height / e.NewDpi.DpiScaleY;
         WindowsUtils.DpiAwareXOffset = ConfigManager.PopupXOffset / e.NewDpi.DpiScaleX;