diff --git a/assets/webui/ofdgo.js b/assets/webui/ofdgo.js index 7c58f77..c86e19b 100644 --- a/assets/webui/ofdgo.js +++ b/assets/webui/ofdgo.js @@ -2727,6 +2727,7 @@ async function closeWorkspace() { } async function closeApplicationWindow() { + await window.ofdgoTheme.flush(); window.removeEventListener("beforeunload", warnUnsaved); window.removeEventListener("beforeunload", warnBatch); let closed = false; diff --git a/assets/webui/ofdgo_theme.js b/assets/webui/ofdgo_theme.js index d72f45e..7a04218 100644 --- a/assets/webui/ofdgo_theme.js +++ b/assets/webui/ofdgo_theme.js @@ -30,6 +30,13 @@ report(error); }); } + async function flush() { + let current; + do { + current = pending; + await current; + } while (current !== pending); + } function set(value) { mode = value; apply(); @@ -48,7 +55,7 @@ mode = ["light", "dark"].includes(event.newValue) ? event.newValue : "system"; apply(); }); - window.ofdgoTheme = {set, connect(value, onError) { + window.ofdgoTheme = {set, flush, connect(value, onError) { host = value; report = onError; const select = document.querySelector("#titleBarMaterial"); diff --git a/go.mod b/go.mod index 552d369..dadcdd4 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/go-text/typesetting v0.3.5 github.com/tdewolff/canvas v0.0.0-20260923214215-09804640d00c github.com/tdewolff/font v0.0.0-20261010204837-88a7f6b56918 - github.com/xiaoqidun/guigo v0.0.0-20261031023018-a9906e2ff59e + github.com/xiaoqidun/guigo v0.0.0-20261031024401-21bc22729961 github.com/xiaoqidun/j2kgo v1.0.2 github.com/xiaoqidun/jbig2 v1.1.8 github.com/xiaoqidun/pdfgo v0.0.0-20261026125713-90454771d5d0 diff --git a/go.sum b/go.sum index ab82522..2a7364c 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,8 @@ github.com/tdewolff/parse/v2 v2.8.16 h1:bLk5svUOQRkW/Y2SJ+DeENSIkZBcTIkq+Atyv5D8 github.com/tdewolff/parse/v2 v2.8.16/go.mod h1:XdsoSFThlVIRIajAuqz1evNY7bagZS8LBOPA3aVopwQ= github.com/tdewolff/test v1.0.12 h1:7F21DqIajswxuche0geHdrUZRCWE4oko4b7bcmkkrxk= github.com/tdewolff/test v1.0.12/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= -github.com/xiaoqidun/guigo v0.0.0-20261031023018-a9906e2ff59e h1:kSMo+IlFgsZSTH0QYOfkhZcpMNxzLSlmOrFmMAVSo+Y= -github.com/xiaoqidun/guigo v0.0.0-20261031023018-a9906e2ff59e/go.mod h1:bXz+dPMVntPIVwePTTuMXt8Q0z1YoUGuROQSsXyUEfY= +github.com/xiaoqidun/guigo v0.0.0-20261031024401-21bc22729961 h1:syGJJRYLYuGEv8d0bcSZBFBxJDy2Omq/gpnJ7CVbQLg= +github.com/xiaoqidun/guigo v0.0.0-20261031024401-21bc22729961/go.mod h1:bXz+dPMVntPIVwePTTuMXt8Q0z1YoUGuROQSsXyUEfY= github.com/xiaoqidun/j2kgo v1.0.2 h1:OAjjEOfaBaQzBNcj9wx+eM68UI5pewR6SzNZa1R1DIw= github.com/xiaoqidun/j2kgo v1.0.2/go.mod h1:DCwAfuDzCDYqUiAlZ7BDwigTjaXw7o9L1FtEma/D1aA= github.com/xiaoqidun/jbig2 v1.1.8 h1:dERPW7F8gs18a/DOD9gXHR3fP1Vl6KhCNsLnq5l3BIo= diff --git a/internal/webview/webview.go b/internal/webview/webview.go index 250772a..29fa0bb 100644 --- a/internal/webview/webview.go +++ b/internal/webview/webview.go @@ -1214,8 +1214,8 @@ func windowOptions(dataDir string) (guigo.Options, error) { return guigo.Options{}, err } material := guigo.TitleBarSolid - if guigo.SupportsTitleBarMaterial(guigo.TitleBarMicaAlt) { - material = guigo.TitleBarMicaAlt + if guigo.SupportsTitleBarMaterial(guigo.TitleBarMica) { + material = guigo.TitleBarMica } return guigo.Options{ AppID: appID, diff --git a/internal/webview/webview_theme.go b/internal/webview/webview_theme.go index bc70cb1..61c35a1 100644 --- a/internal/webview/webview_theme.go +++ b/internal/webview/webview_theme.go @@ -160,7 +160,7 @@ func titleBarMaterial(value string) guigo.TitleBarMaterial { material := guigo.TitleBarSolid switch value { case "mica": - material = guigo.TitleBarMicaAlt + material = guigo.TitleBarMica case "acrylic": material = guigo.TitleBarAcrylic }