Merge branch 'main' of https://github.com/Ebullioscopic/Atoll into feature/lunar-support

conflict resolution needed
This commit is contained in:
Hariharan Mudaliar 2026-03-19 22:26:07 +05:30
commit 9396a5a8ff
No known key found for this signature in database
GPG key ID: 025583EB0BE5640E
4 changed files with 78 additions and 16 deletions

View file

@ -6558,27 +6558,27 @@ struct ClipboardSettings: View {
HStack {
Text("Display Mode")
Spacer()
Picker("Display Mode", selection: $clipboardDisplayMode) {
Picker("", selection: $clipboardDisplayMode) {
ForEach(ClipboardDisplayMode.allCases, id: \.self) { mode in
Text(mode.displayName).tag(mode)
}
}
.pickerStyle(.menu)
.frame(width: 100)
.frame(minWidth: 100)
}
.settingsHighlight(id: highlightID("Display Mode"))
HStack {
Text("History Size")
Spacer()
Picker("History Size", selection: $clipboardHistorySize) {
Picker("", selection: $clipboardHistorySize) {
Text("3 items").tag(3)
Text("5 items").tag(5)
Text("7 items").tag(7)
Text("10 items").tag(10)
}
.pickerStyle(.menu)
.frame(width: 100)
.frame(minWidth: 100)
}
.settingsHighlight(id: highlightID("History Size"))
@ -6769,16 +6769,16 @@ struct ScreenAssistantSettings: View {
HStack {
Text("Display Mode")
Spacer()
Picker("Display Mode", selection: $screenAssistantDisplayMode) {
Picker("", selection: $screenAssistantDisplayMode) {
ForEach(ScreenAssistantDisplayMode.allCases, id: \.self) { mode in
Text(mode.displayName).tag(mode)
}
}
.pickerStyle(.menu)
.frame(width: 100)
.frame(minWidth: 100)
}
.settingsHighlight(id: highlightID("Display Mode"))
HStack {
Text("Attached Files")
Spacer()
@ -6896,27 +6896,27 @@ struct ColorPickerSettings: View {
HStack {
Text("Display Mode")
Spacer()
Picker("Display Mode", selection: $colorPickerDisplayMode) {
Picker("", selection: $colorPickerDisplayMode) {
ForEach(ColorPickerDisplayMode.allCases, id: \.self) { mode in
Text(mode.displayName).tag(mode)
}
}
.pickerStyle(.menu)
.frame(width: 100)
.frame(minWidth: 100)
}
.settingsHighlight(id: highlightID("Display Mode"))
HStack {
Text("History Size")
Spacer()
Picker("History Size", selection: $colorHistorySize) {
Picker("", selection: $colorHistorySize) {
Text("5 colors").tag(5)
Text("10 colors").tag(10)
Text("15 colors").tag(15)
Text("20 colors").tag(20)
}
.pickerStyle(.menu)
.frame(width: 100)
.frame(minWidth: 100)
}
.settingsHighlight(id: highlightID("History Size"))