diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneBehavior.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneBehavior.swift index 8c22bc5e..e681a036 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneBehavior.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneBehavior.swift @@ -267,9 +267,12 @@ public struct VwrSettingsPaneBehavior: View { .settingsDescription() } } - }.formStyled().frame(minWidth: CtlSettingsUI.formWidth, maxWidth: ceil(CtlSettingsUI.formWidth * 1.2)) + }.formStyled() } - .frame(maxHeight: CtlSettingsUI.contentMaxHeight) + .frame( + minWidth: CtlSettingsUI.formWidth, + maxHeight: CtlSettingsUI.contentMaxHeight + ) } } diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneCandidates.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneCandidates.swift index 4460b6fa..c3d272ba 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneCandidates.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneCandidates.swift @@ -201,9 +201,12 @@ public struct VwrSettingsPaneCandidates: View { isOn: $enableMouseScrollingForTDKCandidatesCocoa ) } - }.formStyled().frame(minWidth: CtlSettingsUI.formWidth, maxWidth: ceil(CtlSettingsUI.formWidth * 1.2)) + }.formStyled() } - .frame(maxHeight: CtlSettingsUI.contentMaxHeight) + .frame( + minWidth: CtlSettingsUI.formWidth, + maxHeight: CtlSettingsUI.contentMaxHeight + ) } } diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneCassette.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneCassette.swift index 41456de4..5b3de497 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneCassette.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneCassette.swift @@ -183,9 +183,12 @@ public struct VwrSettingsPaneCassette: View { .settingsDescription() } } - }.formStyled().frame(minWidth: CtlSettingsUI.formWidth, maxWidth: ceil(CtlSettingsUI.formWidth * 1.2)) + }.formStyled() } - .frame(maxHeight: CtlSettingsUI.contentMaxHeight) + .frame( + minWidth: CtlSettingsUI.formWidth, + maxHeight: CtlSettingsUI.contentMaxHeight + ) } } diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneDevZone.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneDevZone.swift index 7f5759ce..6a26460a 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneDevZone.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneDevZone.swift @@ -71,9 +71,12 @@ public struct VwrSettingsPaneDevZone: View { .settingsDescription() } } - }.formStyled().frame(minWidth: CtlSettingsUI.formWidth, maxWidth: ceil(CtlSettingsUI.formWidth * 1.2)) + }.formStyled() } - .frame(maxHeight: CtlSettingsUI.contentMaxHeight) + .frame( + minWidth: CtlSettingsUI.formWidth, + maxHeight: CtlSettingsUI.contentMaxHeight + ) } } diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneDictionary.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneDictionary.swift index 2b1cf8ae..bbcfea07 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneDictionary.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneDictionary.swift @@ -254,9 +254,12 @@ public struct VwrSettingsPaneDictionary: View { }.disabled(keykeyImportButtonDisabled) } } - }.formStyled().frame(minWidth: CtlSettingsUI.formWidth, maxWidth: ceil(CtlSettingsUI.formWidth * 1.2)) + }.formStyled() } - .frame(maxHeight: CtlSettingsUI.contentMaxHeight) + .frame( + minWidth: CtlSettingsUI.formWidth, + maxHeight: CtlSettingsUI.contentMaxHeight + ) } } diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneGeneral.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneGeneral.swift index 98fc8f2b..e34afccc 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneGeneral.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneGeneral.swift @@ -168,9 +168,12 @@ public struct VwrSettingsPaneGeneral: View { isOn: $isDebugModeEnabled ) } - }.formStyled().frame(minWidth: CtlSettingsUI.formWidth, maxWidth: ceil(CtlSettingsUI.formWidth * 1.2)) + }.formStyled() } - .frame(maxHeight: CtlSettingsUI.contentMaxHeight) + .frame( + minWidth: CtlSettingsUI.formWidth, + maxHeight: CtlSettingsUI.contentMaxHeight + ) } } diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneKeyboard.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneKeyboard.swift index 670abd7a..dfaf43fd 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneKeyboard.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneKeyboard.swift @@ -123,9 +123,12 @@ public struct VwrSettingsPaneKeyboard: View { Section(header: Text("Keyboard Shortcuts:")) { VwrSettingsPaneKeyboard_KeyboardShortcuts() } - }.formStyled().frame(minWidth: CtlSettingsUI.formWidth, maxWidth: ceil(CtlSettingsUI.formWidth * 1.2)) + }.formStyled() } - .frame(maxHeight: CtlSettingsUI.contentMaxHeight) + .frame( + minWidth: CtlSettingsUI.formWidth, + maxHeight: CtlSettingsUI.contentMaxHeight + ) } } diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneOutput.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneOutput.swift index cb944891..b7859633 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneOutput.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPaneOutput.swift @@ -72,9 +72,12 @@ public struct VwrSettingsPaneOutput: View { .settingsDescription() } } - }.formStyled().frame(minWidth: CtlSettingsUI.formWidth, maxWidth: ceil(CtlSettingsUI.formWidth * 1.2)) + }.formStyled() } - .frame(maxHeight: CtlSettingsUI.contentMaxHeight) + .frame( + minWidth: CtlSettingsUI.formWidth, + maxHeight: CtlSettingsUI.contentMaxHeight + ) } } diff --git a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPanePhrases.swift b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPanePhrases.swift index 6b4c5394..75caff8a 100644 --- a/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPanePhrases.swift +++ b/Packages/vChewing_MainAssembly/Sources/MainAssembly/SettingsUI/VwrSettingsPanePhrases.swift @@ -25,9 +25,11 @@ public struct VwrSettingsPanePhrases: View { } .padding(4) .padding() - .frame(minWidth: CtlSettingsUI.formWidth, maxWidth: ceil(CtlSettingsUI.formWidth * 1.2)) } - .frame(maxHeight: CtlSettingsUI.contentMaxHeight) + .frame( + minWidth: CtlSettingsUI.formWidth, + maxHeight: CtlSettingsUI.contentMaxHeight + ) } }