mirror of
https://github.com/xiaoqidun/ofdgo.git
synced 2026-10-31 23:11:46 +08:00
1 parent
cd191ac679
commit
2abc0b878c
6 files changed
+15
-7
No files matched your search
@@ -2727,6 +2727,7 @@ async function closeWorkspace() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function closeApplicationWindow() {
|
async function closeApplicationWindow() {
|
||||||
|
await window.ofdgoTheme.flush();
|
||||||
window.removeEventListener("beforeunload", warnUnsaved);
|
window.removeEventListener("beforeunload", warnUnsaved);
|
||||||
window.removeEventListener("beforeunload", warnBatch);
|
window.removeEventListener("beforeunload", warnBatch);
|
||||||
let closed = false;
|
let closed = false;
|
||||||
|
|||||||
@@ -30,6 +30,13 @@
|
|||||||
report(error);
|
report(error);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
async function flush() {
|
||||||
|
let current;
|
||||||
|
do {
|
||||||
|
current = pending;
|
||||||
|
await current;
|
||||||
|
} while (current !== pending);
|
||||||
|
}
|
||||||
function set(value) {
|
function set(value) {
|
||||||
mode = value;
|
mode = value;
|
||||||
apply();
|
apply();
|
||||||
@@ -48,7 +55,7 @@
|
|||||||
mode = ["light", "dark"].includes(event.newValue) ? event.newValue : "system";
|
mode = ["light", "dark"].includes(event.newValue) ? event.newValue : "system";
|
||||||
apply();
|
apply();
|
||||||
});
|
});
|
||||||
window.ofdgoTheme = {set, connect(value, onError) {
|
window.ofdgoTheme = {set, flush, connect(value, onError) {
|
||||||
host = value;
|
host = value;
|
||||||
report = onError;
|
report = onError;
|
||||||
const select = document.querySelector("#titleBarMaterial");
|
const select = document.querySelector("#titleBarMaterial");
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ require (
|
|||||||
github.com/go-text/typesetting v0.3.5
|
github.com/go-text/typesetting v0.3.5
|
||||||
github.com/tdewolff/canvas v0.0.0-20260923214215-09804640d00c
|
github.com/tdewolff/canvas v0.0.0-20260923214215-09804640d00c
|
||||||
github.com/tdewolff/font v0.0.0-20261010204837-88a7f6b56918
|
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/j2kgo v1.0.2
|
||||||
github.com/xiaoqidun/jbig2 v1.1.8
|
github.com/xiaoqidun/jbig2 v1.1.8
|
||||||
github.com/xiaoqidun/pdfgo v0.0.0-20261026125713-90454771d5d0
|
github.com/xiaoqidun/pdfgo v0.0.0-20261026125713-90454771d5d0
|
||||||
|
|||||||
@@ -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/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 h1:7F21DqIajswxuche0geHdrUZRCWE4oko4b7bcmkkrxk=
|
||||||
github.com/tdewolff/test v1.0.12/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8=
|
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-20261031024401-21bc22729961 h1:syGJJRYLYuGEv8d0bcSZBFBxJDy2Omq/gpnJ7CVbQLg=
|
||||||
github.com/xiaoqidun/guigo v0.0.0-20261031023018-a9906e2ff59e/go.mod h1:bXz+dPMVntPIVwePTTuMXt8Q0z1YoUGuROQSsXyUEfY=
|
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 h1:OAjjEOfaBaQzBNcj9wx+eM68UI5pewR6SzNZa1R1DIw=
|
||||||
github.com/xiaoqidun/j2kgo v1.0.2/go.mod h1:DCwAfuDzCDYqUiAlZ7BDwigTjaXw7o9L1FtEma/D1aA=
|
github.com/xiaoqidun/j2kgo v1.0.2/go.mod h1:DCwAfuDzCDYqUiAlZ7BDwigTjaXw7o9L1FtEma/D1aA=
|
||||||
github.com/xiaoqidun/jbig2 v1.1.8 h1:dERPW7F8gs18a/DOD9gXHR3fP1Vl6KhCNsLnq5l3BIo=
|
github.com/xiaoqidun/jbig2 v1.1.8 h1:dERPW7F8gs18a/DOD9gXHR3fP1Vl6KhCNsLnq5l3BIo=
|
||||||
|
|||||||
@@ -1214,8 +1214,8 @@ func windowOptions(dataDir string) (guigo.Options, error) {
|
|||||||
return guigo.Options{}, err
|
return guigo.Options{}, err
|
||||||
}
|
}
|
||||||
material := guigo.TitleBarSolid
|
material := guigo.TitleBarSolid
|
||||||
if guigo.SupportsTitleBarMaterial(guigo.TitleBarMicaAlt) {
|
if guigo.SupportsTitleBarMaterial(guigo.TitleBarMica) {
|
||||||
material = guigo.TitleBarMicaAlt
|
material = guigo.TitleBarMica
|
||||||
}
|
}
|
||||||
return guigo.Options{
|
return guigo.Options{
|
||||||
AppID: appID,
|
AppID: appID,
|
||||||
|
|||||||
@@ -160,7 +160,7 @@ func titleBarMaterial(value string) guigo.TitleBarMaterial {
|
|||||||
material := guigo.TitleBarSolid
|
material := guigo.TitleBarSolid
|
||||||
switch value {
|
switch value {
|
||||||
case "mica":
|
case "mica":
|
||||||
material = guigo.TitleBarMicaAlt
|
material = guigo.TitleBarMica
|
||||||
case "acrylic":
|
case "acrylic":
|
||||||
material = guigo.TitleBarAcrylic
|
material = guigo.TitleBarAcrylic
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user