lupine/ordoor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up the options flow handlers a tiny bit

Browse Source
This commit is contained in:
Nick Thomas
2020-04-02 01:22:53 +01:00
parent aa43011e8d
commit df1f116b3d
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/ordoor/flow/options.go
View File

@@ -11,8 +11,8 @@ func (f *Flow) linkOptions() {
f.configureSlider(options, "2.10", v10Slider) // Music volume slider
f.configureSlider(options, "2.11", v10Slider) // SFX volume slider
f.onClick(options, "2.12", f.acceptOptions()) // OK button
f.onClick(options, "2.24", f.cancelOptions()) // Cancel button
f.onClick(options, "2.12", f.acceptOptions) // OK button
f.onClick(options, "2.24", f.cancelOptions) // Cancel button
f.configureSlider(options, "2.26", h9Slider) // Unit speed slider
f.configureSlider(options, "2.27", h9Slider) // Animation speed slider
@@ -21,12 +21,11 @@ func (f *Flow) linkOptions() {
// TODO: implement keybindings save/load behaviour
f.onClick(kbd, "3.1", f.setDriver(options)) // Done button
f.onClick(kbd, "3.2", f.setDriver(options)) // Cancel button
f.onClick(kbd, "3.4", func() {}) // Reset to defaults button
f.onClick(kbd, "3.4", func() {}) // TODO: Reset to defaults button
}
// FIXME: exiting is a bit OTT. Perhaps display "save failed"?
func (f *Flow) acceptOptions() func() {
return func() {
func (f *Flow) acceptOptions() {
if err := f.optionsIntoConfig(); err != nil {
log.Printf("Saving options to config failed: %v", err)
f.exit = err
@@ -34,12 +33,10 @@ func (f *Flow) acceptOptions() func() {
f.setDriverNow(main)
}
}
}
// FIXME: again, exiting is OTT. We're just resetting the state of
// the interface to the values in config.
func (f *Flow) cancelOptions() func() {
return func() {
func (f *Flow) cancelOptions() {
if err := f.configIntoOptions(); err != nil {
log.Printf("Saving options to config failed: %v", err)
f.exit = err
@@ -47,7 +44,6 @@ func (f *Flow) cancelOptions() func() {
f.exit = f.returnToLastDriverNow(options)
}
}
}
func (f *Flow) configIntoOptions() error {
var err error