mirror of
https://github.com/xiaoqidun/ofdgo.git
synced 2026-10-30 01:27:26 +08:00
1 parent
84ca546d54
commit
bd8add89f3
1 file changed
+1
-24
@@ -17,12 +17,10 @@
|
|||||||
package webview
|
package webview
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"image/png"
|
|
||||||
"io"
|
"io"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"mime"
|
"mime"
|
||||||
@@ -34,8 +32,6 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/tdewolff/canvas"
|
|
||||||
"github.com/tdewolff/canvas/renderers/rasterizer"
|
|
||||||
"github.com/xiaoqidun/guigo"
|
"github.com/xiaoqidun/guigo"
|
||||||
"github.com/xiaoqidun/ofdgo"
|
"github.com/xiaoqidun/ofdgo"
|
||||||
webuiassets "github.com/xiaoqidun/ofdgo/assets/webui"
|
webuiassets "github.com/xiaoqidun/ofdgo/assets/webui"
|
||||||
@@ -649,7 +645,7 @@ func windowOptions(dataDir string) (guigo.Options, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return guigo.Options{}, err
|
return guigo.Options{}, err
|
||||||
}
|
}
|
||||||
icon, err := windowIcon()
|
icon, err := webuiassets.NativeFS.ReadFile("ofdgo.png")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return guigo.Options{}, err
|
return guigo.Options{}, err
|
||||||
}
|
}
|
||||||
@@ -666,22 +662,3 @@ func windowOptions(dataDir string) (guigo.Options, error) {
|
|||||||
UserDataDir: dataDir,
|
UserDataDir: dataDir,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// windowIcon 将共用SVG图标转换为透明PNG,不生成外置文件
|
|
||||||
// 返回: []byte PNG图标, error 转换错误
|
|
||||||
func windowIcon() ([]byte, error) {
|
|
||||||
data, err := webuiassets.NativeFS.ReadFile("ofdgo.svg")
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
graphic, err := canvas.ParseSVG(bytes.NewReader(data))
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
image := rasterizer.Draw(graphic, canvas.DPMM(512/graphic.W), canvas.DefaultColorSpace)
|
|
||||||
var buffer bytes.Buffer
|
|
||||||
if err := png.Encode(&buffer, image); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return buffer.Bytes(), nil
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user