PrefUI // Fix tab page height problems.
This commit is contained in:
parent
35edeaf6e0
commit
4e9faa70c5
|
@ -19,17 +19,19 @@ extension PrefUITabs {
|
||||||
struct VwrPrefPage: View {
|
struct VwrPrefPage: View {
|
||||||
@State var tabType: PrefUITabs
|
@State var tabType: PrefUITabs
|
||||||
var body: some View {
|
var body: some View {
|
||||||
switch tabType {
|
Group {
|
||||||
case .tabGeneral: VwrPrefPaneGeneral()
|
switch tabType {
|
||||||
case .tabCandidates: VwrPrefPaneCandidates()
|
case .tabGeneral: VwrPrefPaneGeneral()
|
||||||
case .tabBehavior: VwrPrefPaneBehavior()
|
case .tabCandidates: VwrPrefPaneCandidates()
|
||||||
case .tabOutput: VwrPrefPaneOutput()
|
case .tabBehavior: VwrPrefPaneBehavior()
|
||||||
case .tabDictionary: VwrPrefPaneDictionary()
|
case .tabOutput: VwrPrefPaneOutput()
|
||||||
case .tabPhrases: VwrPrefPanePhrases()
|
case .tabDictionary: VwrPrefPaneDictionary()
|
||||||
case .tabCassette: VwrPrefPaneCassette()
|
case .tabPhrases: VwrPrefPanePhrases()
|
||||||
case .tabKeyboard: VwrPrefPaneKeyboard()
|
case .tabCassette: VwrPrefPaneCassette()
|
||||||
case .tabDevZone, .tabExperience: VwrPrefPaneDevZone()
|
case .tabKeyboard: VwrPrefPaneKeyboard()
|
||||||
}
|
case .tabDevZone, .tabExperience: VwrPrefPaneDevZone()
|
||||||
|
}
|
||||||
|
}.fixedSize()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -37,23 +37,21 @@ struct VwrPrefPaneGeneral: View {
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
ScrollView {
|
ScrollView {
|
||||||
VStack {
|
|
||||||
_VSpacer(minHeight: 24)
|
|
||||||
Text(
|
|
||||||
"\u{2022} "
|
|
||||||
+ NSLocalizedString(
|
|
||||||
"Please use mouse wheel to scroll each page if needed. The CheatSheet is available in the IME menu.",
|
|
||||||
comment: ""
|
|
||||||
) + "\n\u{2022} "
|
|
||||||
+ NSLocalizedString(
|
|
||||||
"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.",
|
|
||||||
comment: ""
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.preferenceDescription()
|
|
||||||
.fixedSize(horizontal: false, vertical: true)
|
|
||||||
}.frame(maxWidth: CtlPrefUI.contentWidth)
|
|
||||||
SSPreferences.Container(contentWidth: CtlPrefUI.contentWidth) {
|
SSPreferences.Container(contentWidth: CtlPrefUI.contentWidth) {
|
||||||
|
SSPreferences.Section(title: "") {
|
||||||
|
Text(
|
||||||
|
"\u{2022} "
|
||||||
|
+ NSLocalizedString(
|
||||||
|
"Please use mouse wheel to scroll each page if needed. The CheatSheet is available in the IME menu.",
|
||||||
|
comment: ""
|
||||||
|
) + "\n\u{2022} "
|
||||||
|
+ NSLocalizedString(
|
||||||
|
"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.",
|
||||||
|
comment: ""
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.preferenceDescription().prefDescriptionWidthLimited()
|
||||||
|
}
|
||||||
SSPreferences.Section(label: { Text(LocalizedStringKey("UI Language:")) }) {
|
SSPreferences.Section(label: { Text(LocalizedStringKey("UI Language:")) }) {
|
||||||
Picker(
|
Picker(
|
||||||
LocalizedStringKey("Follow OS settings"),
|
LocalizedStringKey("Follow OS settings"),
|
||||||
|
|
Loading…
Reference in New Issue