yetone
d7b1d9df41
On Omarchy the tray's StatusNotifierItem is always registered, so a user who had magpie in the bar's tray and turned on Bar icon got the widget beside it: two magpies. Wails has no Hide on Linux (a no-op), so the item now says Status "Passive" while the widget is in (set through Wails' own properties, as the tooltip is, with NewStatus sent), and "Active" again once it is taken out. Omarchy's Tray.qml leaves Passive items out of both its pinned row and drawer (bucket()), as waybar's tray does; Omarchy itself hides Dropbox's tray item when its Dropbox widget is in the bar. The status is set when the app starts (from whether the widget is in) and whenever Settings' Bar icon adds or removes it (onBarIcon), from what is in the bar afterwards even if the omarchy command failed. TestBarIconTellsTheTray (POST /api/omarchy/widget on, then off, with stand-in omarchy commands) fails with the call taken out: "Bar icon on: the tray was told [], want [true]"; passes with it, -race -count=10. On the omarchy VM (Omarchy 4.0.4 shell): a test SNI item pinned in the bar showed when Active, was gone within a second of Passive + NewStatus and came back on Active. This build (go build -tags gtk3 on the VM, vet clean), run in a sandbox HOME with MAGPIE_OMARCHY=1: with the widget's files in its config the tray item's Status read "Passive" over busctl, without them "Active". Not run on the VM: turning the switch at runtime (the route is covered by the test). go test -race ./internal/gui ./internal/omarchy, gofmt, vet, darwin/linux nogui/windows builds pass.
88 lines
2.6 KiB
Go
88 lines
2.6 KiB
Go
package gui
|
|
|
|
import (
|
|
"encoding/json"
|
|
"log"
|
|
"net/http"
|
|
"os"
|
|
|
|
"github.com/yetone/magpie/internal/omarchy"
|
|
)
|
|
|
|
// onOmarchy is whether magpie runs on Omarchy, asked once: its windows then
|
|
// take Omarchy's look and its bar's place instead of the tray's.
|
|
var onOmarchy = omarchy.Detect()
|
|
|
|
// hyprland is whether magpie runs under Hyprland (omarchy.Hyprland), a
|
|
// variable so a test can stand in for it.
|
|
var hyprland = omarchy.Hyprland
|
|
|
|
// onBarIcon is told whether magpie's icon is in Omarchy's bar once Settings'
|
|
// Bar icon has changed it. The app then takes its tray item out of the bar's
|
|
// tray (setTrayInBar), so the bar shows one magpie, not the widget and the
|
|
// tray icon side by side (Alex on Discord: two icons with Bar icon on).
|
|
var onBarIcon func(on bool)
|
|
|
|
// omarchyTheme is the Omarchy theme the page draws with, when on Omarchy.
|
|
func omarchyTheme() (omarchy.Theme, bool) {
|
|
if !onOmarchy {
|
|
return omarchy.Theme{}, false
|
|
}
|
|
return omarchy.Current()
|
|
}
|
|
|
|
// barIcon is whether magpie can put its icon in Omarchy's bar (the desktop
|
|
// app on Omarchy's Hyprland; not a browser's page), and whether it has.
|
|
func barIcon(w Windows) map[string]bool {
|
|
ok := onOmarchy && !isWeb(w) && hyprland()
|
|
return map[string]bool{"available": ok, "on": ok && omarchy.WidgetOn()}
|
|
}
|
|
|
|
// omarchyRoutes are Settings' Bar icon: magpie's icon in Omarchy's bar
|
|
// beside its own, opening the quick panel, instead of in the tray's drawer.
|
|
func omarchyRoutes(mux *http.ServeMux, w Windows) {
|
|
mux.HandleFunc("GET /api/omarchy/widget", func(rw http.ResponseWriter, r *http.Request) {
|
|
writeJSON(rw, barIcon(w))
|
|
})
|
|
mux.HandleFunc("POST /api/omarchy/widget", func(rw http.ResponseWriter, r *http.Request) {
|
|
var in struct{ On bool }
|
|
if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
|
|
fail(rw, err)
|
|
return
|
|
}
|
|
if !barIcon(w)["available"] {
|
|
http.Error(rw, "Omarchy's bar isn't here", http.StatusConflict)
|
|
return
|
|
}
|
|
var err error
|
|
if in.On {
|
|
var exe string
|
|
if exe, err = os.Executable(); err == nil {
|
|
err = omarchy.AddWidget(exe)
|
|
}
|
|
} else {
|
|
err = omarchy.RemoveWidget()
|
|
}
|
|
// what is in the bar now, though the omarchy command failed after
|
|
// the files went in or out
|
|
if onBarIcon != nil {
|
|
onBarIcon(barIcon(w)["on"])
|
|
}
|
|
if err != nil {
|
|
fail(rw, err)
|
|
return
|
|
}
|
|
writeJSON(rw, barIcon(w))
|
|
})
|
|
// a widget put in by an older magpie, or one elsewhere, runs this one
|
|
if barIcon(w)["on"] {
|
|
go func() {
|
|
if exe, err := os.Executable(); err == nil {
|
|
if err := omarchy.KeepWidget(exe); err != nil {
|
|
log.Println("omarchy bar icon:", err)
|
|
}
|
|
}
|
|
}()
|
|
}
|
|
}
|