From 8cae4d1c8c0f09e51e78d1e316bb51640aff5894 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Mon, 12 Sep 2022 20:53:01 +0800
Subject: [PATCH] PrefUI // Layout optimization.

---
 .../UIModules/PrefUI/suiPrefPaneDevZone.swift |  2 +-
 .../PrefUI/suiPrefPaneDictionary.swift        |  2 +-
 .../PrefUI/suiPrefPaneExperience.swift        |  2 +-
 .../UIModules/PrefUI/suiPrefPaneGeneral.swift |  2 +-
 .../PrefUI/suiPrefPaneKeyboard.swift          | 88 ++++++++++---------
 .../WindowNIBs/Base.lproj/frmPrefWindow.xib   |  4 +-
 6 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift b/Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift
index 10e4b0c4..f547bf94 100644
--- a/Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift
+++ b/Source/Modules/UIModules/PrefUI/suiPrefPaneDevZone.swift
@@ -26,7 +26,7 @@ struct suiPrefPaneDevZone: View {
         if mgrPrefs.appleLanguages[0].contains("zh-Han") {
           return 480
         } else {
-          return 550
+          return 580
         }
     }
   }()
diff --git a/Source/Modules/UIModules/PrefUI/suiPrefPaneDictionary.swift b/Source/Modules/UIModules/PrefUI/suiPrefPaneDictionary.swift
index af7ef700..44c6927a 100644
--- a/Source/Modules/UIModules/PrefUI/suiPrefPaneDictionary.swift
+++ b/Source/Modules/UIModules/PrefUI/suiPrefPaneDictionary.swift
@@ -39,7 +39,7 @@ struct suiPrefPaneDictionary: View {
         if mgrPrefs.appleLanguages[0].contains("zh-Han") {
           return 480
         } else {
-          return 550
+          return 580
         }
     }
   }()
diff --git a/Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift b/Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift
index 430686e8..af90f67b 100644
--- a/Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift
+++ b/Source/Modules/UIModules/PrefUI/suiPrefPaneExperience.swift
@@ -55,7 +55,7 @@ struct suiPrefPaneExperience: View {
         if mgrPrefs.appleLanguages[0].contains("zh-Han") {
           return 480
         } else {
-          return 550
+          return 580
         }
     }
   }()
diff --git a/Source/Modules/UIModules/PrefUI/suiPrefPaneGeneral.swift b/Source/Modules/UIModules/PrefUI/suiPrefPaneGeneral.swift
index 2724985c..656270dd 100644
--- a/Source/Modules/UIModules/PrefUI/suiPrefPaneGeneral.swift
+++ b/Source/Modules/UIModules/PrefUI/suiPrefPaneGeneral.swift
@@ -46,7 +46,7 @@ struct suiPrefPaneGeneral: View {
         if mgrPrefs.appleLanguages[0].contains("zh-Han") {
           return 480
         } else {
-          return 550
+          return 580
         }
     }
   }()
diff --git a/Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift b/Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift
index 53049c55..0849c1cd 100644
--- a/Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift
+++ b/Source/Modules/UIModules/PrefUI/suiPrefPaneKeyboard.swift
@@ -40,7 +40,7 @@ struct suiPrefPaneKeyboard: View {
         if mgrPrefs.appleLanguages[0].contains("zh-Han") {
           return 480
         } else {
-          return 550
+          return 580
         }
     }
   }()
@@ -231,48 +231,54 @@ struct suiPrefPaneKeyboard: View {
           }
         }
         Preferences.Section(bottomDivider: true, label: { Text(LocalizedStringKey("Keyboard Shortcuts:")) }) {
-          Toggle(
-            LocalizedStringKey("Per-Char Select Mode"),
-            isOn: $selUsingHotKeySCPC.onChange {
-              mgrPrefs.usingHotKeySCPC = selUsingHotKeySCPC
+          HStack(alignment: .top, spacing: NSFont.systemFontSize) {
+            VStack(alignment: .leading) {
+              Toggle(
+                LocalizedStringKey("Per-Char Select Mode"),
+                isOn: $selUsingHotKeySCPC.onChange {
+                  mgrPrefs.usingHotKeySCPC = selUsingHotKeySCPC
+                }
+              )
+              Toggle(
+                LocalizedStringKey("Per-Char Associated Phrases"),
+                isOn: $selUsingHotKeyAssociates.onChange {
+                  mgrPrefs.usingHotKeyAssociates = selUsingHotKeyAssociates
+                }
+              )
+              Toggle(
+                LocalizedStringKey("CNS11643 Mode"),
+                isOn: $selUsingHotKeyCNS.onChange {
+                  mgrPrefs.usingHotKeyCNS = selUsingHotKeyCNS
+                }
+              )
+              Toggle(
+                LocalizedStringKey("Force KangXi Writing"),
+                isOn: $selUsingHotKeyKangXi.onChange {
+                  mgrPrefs.usingHotKeyKangXi = selUsingHotKeyKangXi
+                }
+              )
             }
-          )
-          Toggle(
-            LocalizedStringKey("Per-Char Associated Phrases"),
-            isOn: $selUsingHotKeyAssociates.onChange {
-              mgrPrefs.usingHotKeyAssociates = selUsingHotKeyAssociates
+            VStack(alignment: .leading) {
+              Toggle(
+                LocalizedStringKey("JIS Shinjitai Output"),
+                isOn: $selUsingHotKeyJIS.onChange {
+                  mgrPrefs.usingHotKeyJIS = selUsingHotKeyJIS
+                }
+              )
+              Toggle(
+                LocalizedStringKey("Half-Width Punctuation Mode"),
+                isOn: $selUsingHotKeyHalfWidthASCII.onChange {
+                  mgrPrefs.usingHotKeyHalfWidthASCII = selUsingHotKeyHalfWidthASCII
+                }
+              )
+              Toggle(
+                LocalizedStringKey("Currency Numeral Output"),
+                isOn: $selUsingHotKeyCurrencyNumerals.onChange {
+                  mgrPrefs.usingHotKeyCurrencyNumerals = selUsingHotKeyCurrencyNumerals
+                }
+              )
             }
-          )
-          Toggle(
-            LocalizedStringKey("CNS11643 Mode"),
-            isOn: $selUsingHotKeyCNS.onChange {
-              mgrPrefs.usingHotKeyCNS = selUsingHotKeyCNS
-            }
-          )
-          Toggle(
-            LocalizedStringKey("Force KangXi Writing"),
-            isOn: $selUsingHotKeyKangXi.onChange {
-              mgrPrefs.usingHotKeyKangXi = selUsingHotKeyKangXi
-            }
-          )
-          Toggle(
-            LocalizedStringKey("JIS Shinjitai Output"),
-            isOn: $selUsingHotKeyJIS.onChange {
-              mgrPrefs.usingHotKeyJIS = selUsingHotKeyJIS
-            }
-          )
-          Toggle(
-            LocalizedStringKey("Half-Width Punctuation Mode"),
-            isOn: $selUsingHotKeyHalfWidthASCII.onChange {
-              mgrPrefs.usingHotKeyHalfWidthASCII = selUsingHotKeyHalfWidthASCII
-            }
-          )
-          Toggle(
-            LocalizedStringKey("Currency Numeral Output"),
-            isOn: $selUsingHotKeyCurrencyNumerals.onChange {
-              mgrPrefs.usingHotKeyCurrencyNumerals = selUsingHotKeyCurrencyNumerals
-            }
-          )
+          }
         }
       }
     }
diff --git a/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib b/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
index 4a8d8a39..0976b613 100644
--- a/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
+++ b/Source/WindowNIBs/Base.lproj/frmPrefWindow.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21223" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21225" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21223"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21225"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>