SettingsCocoa // Lock dimensions for descriptions and titles.

vChewing · Feb 13, 2024 · 903faae · 903faae
1 parent 820ee5b
commit 903faae
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 28 deletions.
diff --git a/...inAssembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaBehavior.swift b/...inAssembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaBehavior.swift
@@ -55,7 +55,7 @@ public extension SettingsPanesCocoa {
               }
               UserDef.kAlwaysShowTooltipTextsHorizontally.render(fixWidth: contentWidth)
               if Date.isTodayTheDate(from: 0401) {
-                UserDef.kShouldNotFartInLieuOfBeep.render { renderable in
+                UserDef.kShouldNotFartInLieuOfBeep.render(fixWidth: contentWidth) { renderable in
                   renderable.currentControl?.target = self
                   renderable.currentControl?.action = #selector(self.onFartControlChange(_:))
                 }
@@ -69,14 +69,16 @@ public extension SettingsPanesCocoa {
               UserDef.kShareAlphanumericalModeStatusAcrossClients.render(fixWidth: contentWidth)
               if #available(macOS 10.15, *) {
                 NSStackView.build(.vertical) {
-                  UserDef.kTogglingAlphanumericalModeWithLShift.render { renderable in
-                    renderable.currentControl?.target = self
-                    renderable.currentControl?.action = #selector(self.syncShiftKeyUpChecker(_:))
-                  }
-                  UserDef.kTogglingAlphanumericalModeWithRShift.render { renderable in
-                    renderable.currentControl?.target = self
-                    renderable.currentControl?.action = #selector(self.syncShiftKeyUpChecker(_:))
-                  }
+                  UserDef.kTogglingAlphanumericalModeWithLShift
+                    .render(fixWidth: contentWidth) { renderable in
+                      renderable.currentControl?.target = self
+                      renderable.currentControl?.action = #selector(self.syncShiftKeyUpChecker(_:))
+                    }
+                  UserDef.kTogglingAlphanumericalModeWithRShift
+                    .render(fixWidth: contentWidth) { renderable in
+                      renderable.currentControl?.target = self
+                      renderable.currentControl?.action = #selector(self.syncShiftKeyUpChecker(_:))
+                    }
                   var strOSReq = " "
                   strOSReq += String(
                     format: "This feature requires macOS %@ and above.".localized, arguments: ["10.15"]

diff --git a/...Assembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaCandidates.swift b/...Assembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaCandidates.swift
@@ -29,7 +29,7 @@ public extension SettingsPanesCocoa {
           NSTabView.TabPage(title: "Ａ") {
             NSStackView.buildSection(width: contentWidth) {
               UserDef.kUseHorizontalCandidateList.render(fixWidth: contentWidth)
-              UserDef.kCandidateListTextSize.render { renderable in
+              UserDef.kCandidateListTextSize.render(fixWidth: contentWidth) { renderable in
                 renderable.currentControl?.target = self
                 renderable.currentControl?.action = #selector(self.candidateFontSizeDidSet(_:))
               }
@@ -41,7 +41,7 @@ public extension SettingsPanesCocoa {
           }
           NSTabView.TabPage(title: "Ｂ") {
             NSStackView.buildSection(width: contentWidth) {
-              UserDef.kCandidateKeys.render { renderable in
+              UserDef.kCandidateKeys.render(fixWidth: contentWidth) { renderable in
                 renderable.currentControl?.target = self
                 renderable.currentControl?.action = #selector(self.candidateKeysDidSet(_:))
                 renderable.currentControl?.alignment = .right

diff --git a/...inAssembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaCassette.swift b/...inAssembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaCassette.swift
@@ -27,11 +27,11 @@ public extension SettingsPanesCocoa {
     var body: NSView? {
       NSStackView.build(.vertical, insets: .new(all: 14)) {
         NSStackView.buildSection(width: contentWidth) {
-          UserDef.kCassettePath.render { renderable in
+          UserDef.kCassettePath.render(fixWidth: contentWidth) { renderable in
             renderable.currentControl = self.pctCassetteFilePath
             renderable.mainViewOverride = self.pathControlMainView
           }
-          UserDef.kCassetteEnabled.render { renderable in
+          UserDef.kCassetteEnabled.render(fixWidth: contentWidth) { renderable in
             renderable.currentControl?.target = self
             renderable.currentControl?.action = #selector(self.cassetteEnabledToggled(_:))
           }

diff --git a/...Assembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaDictionary.swift b/...Assembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaDictionary.swift
@@ -27,33 +27,33 @@ public extension SettingsPanesCocoa {
     var body: NSView? {
       NSStackView.build(.vertical, insets: .new(all: 14)) {
         NSStackView.buildSection(width: contentWidth) {
-          UserDef.kUserDataFolderSpecified.render { renderable in
+          UserDef.kUserDataFolderSpecified.render(fixWidth: contentWidth) { renderable in
             renderable.currentControl = self.pctUserDictionaryFolder
             renderable.mainViewOverride = self.pathControlMainView
           }
           NSStackView.build(.vertical) {
-            UserDef.kShouldAutoReloadUserDataFiles.render { renderable in
+            UserDef.kShouldAutoReloadUserDataFiles.render(fixWidth: contentWidth) { renderable in
               renderable.currentControl?.target = self
               renderable.currentControl?.action = #selector(self.lmmgrInitUserLMsWhenShould(_:))
             }
             "Due to security concerns, we don't consider implementing anything related to shell script execution here. An input method doing this without implementing App Sandbox will definitely have system-wide vulnerabilities, considering that its related UserDefaults are easily tamperable to execute malicious shell scripts. vChewing is designed to be invulnerable from this kind of attack. Also, official releases of vChewing are Sandboxed.".makeNSLabel(descriptive: true, fixWidth: contentWidth)
           }
         }?.boxed()
         NSStackView.buildSection(width: contentWidth) {
-          UserDef.kUseExternalFactoryDict.render { renderable in
+          UserDef.kUseExternalFactoryDict.render(fixWidth: contentWidth) { renderable in
             renderable.currentControl?.target = self
             renderable.currentControl?.action = #selector(self.lmmgrConnectCoreDB(_:))
           }
           UserDef.kFetchSuggestionsFromUserOverrideModel.render(fixWidth: contentWidth)
-          UserDef.kCNS11643Enabled.render { renderable in
+          UserDef.kCNS11643Enabled.render(fixWidth: contentWidth) { renderable in
             renderable.currentControl?.target = self
             renderable.currentControl?.action = #selector(self.lmmgrSyncLMPrefs(_:))
           }
-          UserDef.kSymbolInputEnabled.render { renderable in
+          UserDef.kSymbolInputEnabled.render(fixWidth: contentWidth) { renderable in
             renderable.currentControl?.target = self
             renderable.currentControl?.action = #selector(self.lmmgrSyncLMPrefs(_:))
           }
-          UserDef.kPhraseReplacementEnabled.render { renderable in
+          UserDef.kPhraseReplacementEnabled.render(fixWidth: contentWidth) { renderable in
             renderable.currentControl?.target = self
             renderable.currentControl?.action = #selector(self.lmmgrSyncLMPrefsWithReplacementTable(_:))
           }

diff --git a/...ainAssembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaGeneral.swift b/...ainAssembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaGeneral.swift
@@ -34,7 +34,7 @@ public extension SettingsPanesCocoa {
           strNotice += "\n\u{2022} "
           strNotice += "Note: The “Delete ⌫” key on Mac keyboard is named as “BackSpace ⌫” here in order to distinguish the real “Delete ⌦” key from full-sized desktop keyboards. If you want to use the real “Delete ⌦” key on a Mac keyboard with no numpad equipped, you have to press “Fn+⌫” instead.".localized
           strNotice.makeNSLabel(descriptive: true, fixWidth: contentWidth)
-          UserDef.kAppleLanguages.render { renderable in
+          UserDef.kAppleLanguages.render(fixWidth: contentWidth) { renderable in
             renderable.currentControl = self.btnLangSelector
           }
         }?.boxed()

diff --git a/...MainAssembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaOutput.swift b/...MainAssembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaOutput.swift
@@ -24,11 +24,11 @@ public extension SettingsPanesCocoa {
     var body: NSView? {
       NSStackView.build(.vertical, insets: .new(all: 14)) {
         NSStackView.buildSection(width: contentWidth) {
-          UserDef.kChineseConversionEnabled.render { renderable in
+          UserDef.kChineseConversionEnabled.render(fixWidth: contentWidth) { renderable in
             renderable.currentControl?.target = self
             renderable.currentControl?.action = #selector(self.sanityCheckKangXi(_:))
           }
-          UserDef.kShiftJISShinjitaiOutputEnabled.render { renderable in
+          UserDef.kShiftJISShinjitaiOutputEnabled.render(fixWidth: contentWidth) { renderable in
             renderable.currentControl?.target = self
             renderable.currentControl?.action = #selector(self.sanityCheckJIS(_:))
           }

diff --git a/...ainAssembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaPhrases.swift b/...ainAssembly/Sources/MainAssembly/Settings/SettingsCocoa/VwrSettingsPaneCocoaPhrases.swift
@@ -81,9 +81,10 @@ public extension SettingsPanesCocoa {
               txtPEField3.makeSimpleConstraint(.width, relation: .greaterThanOrEqual, value: 90)
               btnPEAdd
             }
-            UserDef.kPhraseEditorAutoReloadExternalModifications.render { renderable in
-              renderable.tinySize = true
-            }
+            UserDef.kPhraseEditorAutoReloadExternalModifications
+              .render(fixWidth: contentWidth) { renderable in
+                renderable.tinySize = true
+              }
           }
         }?.boxed()
         NSView().makeSimpleConstraint(.height, relation: .equal, value: NSFont.systemFontSize)

diff --git a/Packages/vChewing_Shared/Sources/Shared/UserDef/UserDefRenderableCocoa.swift b/Packages/vChewing_Shared/Sources/Shared/UserDef/UserDefRenderableCocoa.swift
@@ -108,6 +108,11 @@ public extension UserDefRenderableCocoa {
       textField.font = NSFont.systemFont(ofSize: NSFont.smallSystemFontSize)
     }
     textField.preferredMaxLayoutWidth = fixedWidth ?? 0
+    if let fixedWidth = fixedWidth {
+      textField.makeSimpleConstraint(.width, relation: .lessThanOrEqual, value: fixedWidth)
+      textField.sizeToFit()
+      textField.makeSimpleConstraint(.height, relation: .lessThanOrEqual, value: textField.fittingSize.height)
+    }
     return textField
   }
 
@@ -130,10 +135,12 @@ public extension UserDefRenderableCocoa {
       }
       control
     }
-    if let fixedWidth = fixedWidth {
+    if let fixedWidth = fixedWidth, let textLabel = textLabel {
       let specifiedWidth = fixedWidth - controlWidth - NSFont.systemFontSize
-      textLabel?.preferredMaxLayoutWidth = specifiedWidth
-      textLabel?.makeSimpleConstraint(.width, relation: .lessThanOrEqual, value: specifiedWidth)
+      textLabel.preferredMaxLayoutWidth = specifiedWidth
+      textLabel.makeSimpleConstraint(.width, relation: .lessThanOrEqual, value: specifiedWidth)
+      textLabel.sizeToFit()
+      textLabel.makeSimpleConstraint(.height, relation: .lessThanOrEqual, value: textLabel.fittingSize.height)
     }
     textLabel?.sizeToFit()
     return result