Add autofocus mode.
This commit is contained in:
1 parent
b232c1eebb
commit
3e2429b8a5
19 files changed
+279
-8
No files matched your search
@@ -12,7 +12,7 @@ import (
|
||||
)
|
||||
|
||||
func FromSettings(settings config.Settings) Values {
|
||||
return Values{OCR: settings.OCR, Pronunciations: append([]config.PronunciationEntry(nil), settings.Pronunciations...),
|
||||
return Values{StructuralNavigationTriggersFocusMode: settings.StructuralNavigationTriggersFocusMode, OCR: settings.OCR, Pronunciations: append([]config.PronunciationEntry(nil), settings.Pronunciations...),
|
||||
TextAttributes: config.TextAttributeSettings{Choices: append([]config.TextAttributeChoice(nil), settings.TextAttributes.Choices...), Indicator: settings.TextAttributes.Indicator},
|
||||
KeyboardLayout: settings.KeyboardLayout, CthulhuModifierKeys: append([]string(nil), settings.CthulhuModifierKeys...),
|
||||
KeyBindings: input.CloneBindingOverrides(settings.KeyBindings), TimeFormat: settings.TimeFormat, DateFormat: settings.DateFormat,
|
||||
@@ -74,6 +74,7 @@ func (values Values) Merge(settings config.Settings) (config.Settings, error) {
|
||||
settings.Pronunciations = append([]config.PronunciationEntry(nil), values.Pronunciations...)
|
||||
settings.TextAttributes = config.TextAttributeSettings{Choices: append([]config.TextAttributeChoice(nil), values.TextAttributes.Choices...), Indicator: values.TextAttributes.Indicator}
|
||||
settings.OCR = values.OCR
|
||||
settings.StructuralNavigationTriggersFocusMode = values.StructuralNavigationTriggersFocusMode
|
||||
settings.KeyboardLayout = values.KeyboardLayout
|
||||
settings.CthulhuModifierKeys = append([]string(nil), values.CthulhuModifierKeys...)
|
||||
settings.KeyBindings = input.CloneBindingOverrides(values.KeyBindings)
|
||||
|
||||
Reference in new issue
Block a user