owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add playback controls to dock menu on MacOS

Browse Source
This commit is contained in:
Drew Weymouth
2026-07-20 18:18:24 -07:00
parent ab087c6d49
commit c80f4399eb
4 changed files with 130 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/mainwindow.go
+34 -27
View File
@@ -62,6 +62,7 @@ func NewMainWindow(fyneApp fyne.App, appName, displayAppName, appVersion string,
theme: myTheme.NewMyTheme(&app.Config.Theme, app.ThemesDir()),
}
installReopenHandler(m.Window)
installDockMenu(m.createSystemTrayAndDockMenu(false))
fynetooltip.SetToolTipTextSizeName(myTheme.SizeNameSubText)
m.theme.NormalFont = app.Config.Application.FontNormalTTF
@@ -405,33 +406,7 @@ func (m *MainWindow) RunOnServerConnectedTasks(serverConf *backend.ServerConfig,
func (m *MainWindow) SetupSystemTrayMenu(appName string, fyneApp fyne.App) {
if desk, ok := fyneApp.(desktop.App); ok {
menu := fyne.NewMenu(appName,
fyne.NewMenuItem(fmt.Sprintf("%s/%s", lang.L("Play"), lang.L("Pause")), func() {
m.App.PlaybackManager.PlayPause()
}),
fyne.NewMenuItem(lang.L("Previous"), func() {
m.App.PlaybackManager.SeekBackOrPrevious()
}),
fyne.NewMenuItem(lang.L("Next"), func() {
m.App.PlaybackManager.SeekNext()
}),
fyne.NewMenuItemSeparator(),
fyne.NewMenuItem(lang.L("Volume")+" +10%", func() {
vol := m.App.PlaybackManager.Volume()
vol = vol + int(float64(vol)*0.1)
// will clamp to range for us
m.App.PlaybackManager.SetVolume(vol)
}),
fyne.NewMenuItem(lang.L("Volume")+" -10%", func() {
vol := m.App.PlaybackManager.Volume()
vol = vol - int(float64(vol)*0.1)
m.App.PlaybackManager.SetVolume(vol)
}),
fyne.NewMenuItemSeparator(),
fyne.NewMenuItem(lang.L("Show"), m.Window.Show),
fyne.NewMenuItem(lang.L("Hide"), m.Window.Hide),
)
desk.SetSystemTrayMenu(menu)
desk.SetSystemTrayMenu(m.createSystemTrayAndDockMenu(true))
desk.SetSystemTrayIcon(res.ResAppicon256Png)
if runtime.GOOS != "darwin" {
// Left-click opening systray menu instead of raising window
@@ -442,6 +417,38 @@ func (m *MainWindow) SetupSystemTrayMenu(appName string, fyneApp fyne.App) {
}
}
func (m *MainWindow) createSystemTrayAndDockMenu(includeShowAndHide bool) *fyne.Menu {
menu := fyne.NewMenu("",
fyne.NewMenuItem(fmt.Sprintf("%s/%s", lang.L("Play"), lang.L("Pause")), func() {
m.App.PlaybackManager.PlayPause()
}),
fyne.NewMenuItem(lang.L("Previous"), func() {
m.App.PlaybackManager.SeekBackOrPrevious()
}),
fyne.NewMenuItem(lang.L("Next"), func() {
m.App.PlaybackManager.SeekNext()
}),
fyne.NewMenuItemSeparator(),
fyne.NewMenuItem(lang.L("Volume")+" +10%", func() {
vol := m.App.PlaybackManager.Volume()
vol = vol + int(float64(vol)*0.1)
// will clamp to range for us
m.App.PlaybackManager.SetVolume(vol)
}),
fyne.NewMenuItem(lang.L("Volume")+" -10%", func() {
vol := m.App.PlaybackManager.Volume()
vol = vol - int(float64(vol)*0.1)
m.App.PlaybackManager.SetVolume(vol)
}),
)
if includeShowAndHide {
menu.Items = append(menu.Items, fyne.NewMenuItemSeparator())
menu.Items = append(menu.Items, fyne.NewMenuItem(lang.L("Show"), m.Window.Show))
menu.Items = append(menu.Items, fyne.NewMenuItem(lang.L("Hide"), m.Window.Hide))
}
return menu
}
func (m *MainWindow) HaveSystemTray() bool {
return m.haveSystemTray
}