SketchyMaze/doodle
SketchyMaze/doodle
1
0
Fork 0
Code Issues 41 Pull Requests 1 Releases Wiki Activity

Fix the Save As and Open menu buttons in Edit Mode

Browse Source 
The "Save As" and "Open" buttons still used an old implementation that
assumed you were talking about files only in the "./maps" folder instead
of loading them from the user's levels and doodads folders.

Now all of the menu buttons in Edit Mode intelligently open files the
same as the `edit <filename>` command from the dev console. You can omit
the file extension and it will attempt to load a Level before a Doodad
to find the first named file, or provide the full extension to be
specific.
This commit is contained in:
Noah 2019-04-15 23:22:38 -07:00
parent 1e80304061
commit c70add17e4
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pkg/editor_ui.go
View File

@ -317,6 +317,30 @@ func (u *EditorUI) ExpandCanvas(e render.Engine) {
func (u *EditorUI) SetupMenuBar(d *Doodle) *ui.Frame { func (u *EditorUI) SetupMenuBar(d *Doodle) *ui.Frame {
frame := ui.NewFrame("MenuBar") frame := ui.NewFrame("MenuBar")
// Save and Save As common menu handler
var saveFunc func(filename string)
switch u.Scene.DrawingType {
case enum.LevelDrawing:
saveFunc = func(filename string) {
if err := u.Scene.SaveLevel(filename); err != nil {
d.Flash("Error: %s", err)
} else {
d.Flash("Saved level: %s", filename)
}
}
case enum.DoodadDrawing:
saveFunc = func(filename string) {
if err := u.Scene.SaveDoodad(filename); err != nil {
d.Flash("Error: %s", err)
} else {
d.Flash("Saved doodad: %s", filename)
}
}
default:
d.Flash("Error: Scene.DrawingType is not a valid type")
}
type menuButton struct { type menuButton struct {
Text string Text string
Click func(render.Point) Click func(render.Point)
@ -348,29 +372,6 @@ func (u *EditorUI) SetupMenuBar(d *Doodle) *ui.Frame {
menuButton{ menuButton{
Text: "Save", Text: "Save",
Click: func(render.Point) { Click: func(render.Point) {
var saveFunc func(filename string)
switch u.Scene.DrawingType {
case enum.LevelDrawing:
saveFunc = func(filename string) {
if err := u.Scene.SaveLevel(filename); err != nil {
d.Flash("Error: %s", err)
} else {
d.Flash("Saved level: %s", filename)
}
}
case enum.DoodadDrawing:
saveFunc = func(filename string) {
if err := u.Scene.SaveDoodad(filename); err != nil {
d.Flash("Error: %s", err)
} else {
d.Flash("Saved doodad: %s", filename)
}
}
default:
d.Flash("Error: Scene.DrawingType is not a valid type")
}
if u.Scene.filename != "" { if u.Scene.filename != "" {
saveFunc(u.Scene.filename) saveFunc(u.Scene.filename)
} else { } else {
@ -387,8 +388,7 @@ func (u *EditorUI) SetupMenuBar(d *Doodle) *ui.Frame {
Click: func(render.Point) { Click: func(render.Point) {
d.Prompt("Save as filename>", func(answer string) { d.Prompt("Save as filename>", func(answer string) {
if answer != "" { if answer != "" {
u.Scene.SaveLevel("./maps/" + answer) // TODO: maps path saveFunc(answer)
d.Flash("Saved: %s", answer)
} }
}) })
}, },
@ -398,7 +398,9 @@ func (u *EditorUI) SetupMenuBar(d *Doodle) *ui.Frame {
Click: func(render.Point) { Click: func(render.Point) {
d.Prompt("Open filename>", func(answer string) { d.Prompt("Open filename>", func(answer string) {
if answer != "" { if answer != "" {
u.d.EditDrawing("./maps/" + answer) // TODO: maps path if err := d.EditFile(answer); err != nil {
d.Flash("File not found: %s", answer)
}
} }
}) })
}, },