Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address crash with empty main menu #1075

Merged
merged 3 commits into from Jun 7, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion internal/driver/glfw/menu.go
Expand Up @@ -5,7 +5,15 @@ import (
)

func buildMenuOverlay(menus *fyne.MainMenu, c fyne.Canvas) fyne.CanvasObject {
if menus.Items[0].Items[len(menus.Items[0].Items)-1].Label != "Quit" { // make sure the first menu always has a quit option
if len(menus.Items) == 0 {
fyne.LogError("Main menu must have at least one child menu", nil)
return nil
}
var firstItem *fyne.MenuItem
if len(menus.Items[0].Items) > 0 {
firstItem = menus.Items[0].Items[len(menus.Items[0].Items)-1]
}
if firstItem == nil || firstItem.Label != "Quit" { // make sure the first menu always has a quit option
quitItem := fyne.NewMenuItem("Quit", func() {
fyne.CurrentApp().Quit()
})
Expand Down
36 changes: 36 additions & 0 deletions internal/driver/glfw/menu_test.go
@@ -0,0 +1,36 @@
// +build !ci
// +build !mobile

package glfw

import (
"testing"

"fyne.io/fyne"

"github.com/stretchr/testify/assert"
)

func Test_Menu_Empty(t *testing.T) {
w := createWindow("Menu Test").(*window)
bar := buildMenuOverlay(fyne.NewMainMenu(), w.canvas)
assert.Nil(t, bar) // no bar but does not crash
}

func Test_Menu_AddsQuit(t *testing.T) {
w := createWindow("Menu Test").(*window)
mainMenu := fyne.NewMainMenu(fyne.NewMenu("File"))
bar := buildMenuOverlay(mainMenu, w.canvas)
assert.NotNil(t, bar)
assert.Equal(t, 1, len(mainMenu.Items))
assert.Equal(t, 2, len(mainMenu.Items[0].Items)) // separator+quit inserted
}

func Test_Menu_LeaveQuit(t *testing.T) {
w := createWindow("Menu Test").(*window)
mainMenu := fyne.NewMainMenu(fyne.NewMenu("File", fyne.NewMenuItem("Quit", nil)))
bar := buildMenuOverlay(mainMenu, w.canvas)
assert.NotNil(t, bar)
assert.Equal(t, 1, len(mainMenu.Items[0].Items)) // no separator added
assert.Nil(t, mainMenu.Items[0].Items[0].Action) // no quit handler added
}