diff --git a/example/browser-context-menu/resources/icon.ico b/example/browser-context-menu/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-context-menu/resources/icon.ico and b/example/browser-context-menu/resources/icon.ico differ diff --git a/example/browser-context-menu/resources/icon.png b/example/browser-context-menu/resources/icon.png index ba865e378383fd9e6a34601754b326f6eee5e3fd..c201354e44f45f95d026d5c528dbdc88593513da 100644 Binary files a/example/browser-context-menu/resources/icon.png and b/example/browser-context-menu/resources/icon.png differ diff --git a/example/browser-control/resources/icon.ico b/example/browser-control/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-control/resources/icon.ico and b/example/browser-control/resources/icon.ico differ diff --git a/example/browser-control/resources/icon.png b/example/browser-control/resources/icon.png index ba865e378383fd9e6a34601754b326f6eee5e3fd..c201354e44f45f95d026d5c528dbdc88593513da 100644 Binary files a/example/browser-control/resources/icon.png and b/example/browser-control/resources/icon.png differ diff --git a/example/browser-cookie-manager/resources/icon.ico b/example/browser-cookie-manager/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-cookie-manager/resources/icon.ico and b/example/browser-cookie-manager/resources/icon.ico differ diff --git a/example/browser-cookie-manager/resources/icon.png b/example/browser-cookie-manager/resources/icon.png index ba865e378383fd9e6a34601754b326f6eee5e3fd..c201354e44f45f95d026d5c528dbdc88593513da 100644 Binary files a/example/browser-cookie-manager/resources/icon.png and b/example/browser-cookie-manager/resources/icon.png differ diff --git a/example/browser-cookie/resources/icon.ico b/example/browser-cookie/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-cookie/resources/icon.ico and b/example/browser-cookie/resources/icon.ico differ diff --git a/example/browser-cookie/resources/icon.png b/example/browser-cookie/resources/icon.png index ba865e378383fd9e6a34601754b326f6eee5e3fd..c201354e44f45f95d026d5c528dbdc88593513da 100644 Binary files a/example/browser-cookie/resources/icon.png and b/example/browser-cookie/resources/icon.png differ diff --git a/example/browser-dom-visitor/dom-visitor.go b/example/browser-dom-visitor/dom-visitor.go index 20d05fef3bf6ff308c928cdabcd5fc825885a05f..6505b9f2a1731d80566e23bd6ee664f42c3cf176 100644 --- a/example/browser-dom-visitor/dom-visitor.go +++ b/example/browser-dom-visitor/dom-visitor.go @@ -8,6 +8,7 @@ import ( "github.com/energye/energy/v2/cef/ipc/callback" "github.com/energye/energy/v2/cef/ipc/types" "github.com/energye/energy/v2/cef/process" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/consts" "github.com/energye/energy/v2/pkgs/assetserve" //_ "net/http/pprof" @@ -24,7 +25,11 @@ func main() { //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/dom-visitor.html" cef.BrowserWindow.Config.Title = "Energy - dom-visitor" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } // DomVisitor 必须在渲染进程中执行 // 示例 diff --git a/example/browser-dom-visitor/resources/icon.ico b/example/browser-dom-visitor/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-dom-visitor/resources/icon.ico and b/example/browser-dom-visitor/resources/icon.ico differ diff --git a/example/browser-dom-visitor/resources/icon.png b/example/browser-dom-visitor/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-dom-visitor/resources/icon.png differ diff --git a/example/browser-download/download.go b/example/browser-download/download.go index 2866dbda5d91fb46099e27ad678422194f3815c7..60d917cf3677f3dfb4cde577d3b4e4c4cf5bd29d 100644 --- a/example/browser-download/download.go +++ b/example/browser-download/download.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/energye/energy/v2/cef" "github.com/energye/energy/v2/cef/ipc" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/pkgs/assetserve" "github.com/energye/golcl/lcl" ) @@ -24,7 +25,11 @@ func main() { //主窗口的配置 //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/download.html" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } //在主窗口初始化回调函数里设置浏览器事件 cef.BrowserWindow.SetBrowserInit(func(event *cef.BrowserEvent, browserWindow cef.IBrowserWindow) { //下载更新事件 diff --git a/example/browser-download/resources/icon.ico b/example/browser-download/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-download/resources/icon.ico and b/example/browser-download/resources/icon.ico differ diff --git a/example/browser-download/resources/icon.png b/example/browser-download/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-download/resources/icon.png differ diff --git a/example/browser-execute-dev-tools-method/dev-tools-method.go b/example/browser-execute-dev-tools-method/dev-tools-method.go index 5ed6528096c196f7e2c983e85d1ef780f500608f..7c75fdd1ec600dc585cc74bc0d283edd65e1dac8 100644 --- a/example/browser-execute-dev-tools-method/dev-tools-method.go +++ b/example/browser-execute-dev-tools-method/dev-tools-method.go @@ -6,6 +6,7 @@ import ( "github.com/energye/energy/v2/cef" "github.com/energye/energy/v2/cef/ipc" "github.com/energye/energy/v2/cef/ipc/context" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/consts" "github.com/energye/energy/v2/pkgs/assetserve" ) @@ -23,7 +24,11 @@ func main() { //主窗口的配置 //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/execute-dev-tool-method.html" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } //chromium配置 //config := cef.NewChromiumConfig() //config.SetEnableMenu(true) //启用右键菜单 diff --git a/example/browser-execute-dev-tools-method/resources/icon.ico b/example/browser-execute-dev-tools-method/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-execute-dev-tools-method/resources/icon.ico and b/example/browser-execute-dev-tools-method/resources/icon.ico differ diff --git a/example/browser-execute-dev-tools-method/resources/icon.png b/example/browser-execute-dev-tools-method/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-execute-dev-tools-method/resources/icon.png differ diff --git a/example/browser-execute-javascript/execute-javascript.go b/example/browser-execute-javascript/execute-javascript.go index 267a97fb25d07b5d957d220ec71e436481491a95..af9d6fc179987a1b73ec756698c0726c0aa46269 100644 --- a/example/browser-execute-javascript/execute-javascript.go +++ b/example/browser-execute-javascript/execute-javascript.go @@ -4,6 +4,7 @@ import ( "embed" "fmt" "github.com/energye/energy/v2/cef" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/pkgs/assetserve" "github.com/energye/golcl/lcl" "time" @@ -20,7 +21,11 @@ func main() { //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/execute-javascript.html" cef.BrowserWindow.Config.Title = "Energy - execute-javascript" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } //内置http服务链接安全配置 cef.SetBrowserProcessStartAfterCallback(func(b bool) { fmt.Println("主进程启动 创建一个内置http服务") diff --git a/example/browser-execute-javascript/resources/icon.ico b/example/browser-execute-javascript/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-execute-javascript/resources/icon.ico and b/example/browser-execute-javascript/resources/icon.ico differ diff --git a/example/browser-execute-javascript/resources/icon.png b/example/browser-execute-javascript/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-execute-javascript/resources/icon.png differ diff --git a/example/browser-frameless/resources/icon.ico b/example/browser-frameless/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-frameless/resources/icon.ico and b/example/browser-frameless/resources/icon.ico differ diff --git a/example/browser-frameless/resources/icon.png b/example/browser-frameless/resources/icon.png index ba865e378383fd9e6a34601754b326f6eee5e3fd..c201354e44f45f95d026d5c528dbdc88593513da 100644 Binary files a/example/browser-frameless/resources/icon.png and b/example/browser-frameless/resources/icon.png differ diff --git a/example/browser-i18n/resources/icon.ico b/example/browser-i18n/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-i18n/resources/icon.ico and b/example/browser-i18n/resources/icon.ico differ diff --git a/example/browser-i18n/resources/icon.png b/example/browser-i18n/resources/icon.png index ba865e378383fd9e6a34601754b326f6eee5e3fd..c201354e44f45f95d026d5c528dbdc88593513da 100644 Binary files a/example/browser-i18n/resources/icon.png and b/example/browser-i18n/resources/icon.png differ diff --git a/example/browser-internal-http-server/internal-http-server.go b/example/browser-internal-http-server/internal-http-server.go index df2980cd260dfb9261b9f6a890c752996ffaec00..164f9b2abf45623e65583562939ef2f7fd09f311 100644 --- a/example/browser-internal-http-server/internal-http-server.go +++ b/example/browser-internal-http-server/internal-http-server.go @@ -4,6 +4,7 @@ import ( "embed" "fmt" "github.com/energye/energy/v2/cef" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/pkgs/assetserve" ) @@ -19,7 +20,11 @@ func main() { cefApp := cef.NewApplication() //主窗口的配置 cef.BrowserWindow.Config.Title = "Energy - 内置资源和内置服务示例" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/internal-http-server.html" //内置静态资源服务的安全key和value设置 diff --git a/example/browser-internal-http-server/resources/energy-icon.png b/example/browser-internal-http-server/resources/energy-icon.png deleted file mode 100644 index ba865e378383fd9e6a34601754b326f6eee5e3fd..0000000000000000000000000000000000000000 Binary files a/example/browser-internal-http-server/resources/energy-icon.png and /dev/null differ diff --git a/example/browser-internal-http-server/resources/icon.ico b/example/browser-internal-http-server/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-internal-http-server/resources/icon.ico and b/example/browser-internal-http-server/resources/icon.ico differ diff --git a/example/browser-internal-http-server/resources/icon.png b/example/browser-internal-http-server/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-internal-http-server/resources/icon.png differ diff --git a/example/browser-ipc-on-emit/go-composite-type/go-composite-type.go b/example/browser-ipc-on-emit/go-composite-type/go-composite-type.go index ac701c0bdffb908b32e3ccce1b22c7121da5692d..20a43b57d6da4ccadecd9d05b6c1c0bd3dccf1d4 100644 --- a/example/browser-ipc-on-emit/go-composite-type/go-composite-type.go +++ b/example/browser-ipc-on-emit/go-composite-type/go-composite-type.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/energye/energy/v2/cef" "github.com/energye/energy/v2/cef/ipc" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/example/browser-ipc-on-emit/go-composite-type/src" "github.com/energye/energy/v2/pkgs/assetserve" "strconv" @@ -21,7 +22,11 @@ func main() { //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/go-composite-type.html" cef.BrowserWindow.Config.Title = "Energy - go-composite-type" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } // 在这个示例中演示了复合类型参数 // 包含 struct slice map diff --git a/example/browser-ipc-on-emit/go-composite-type/resources/icon.ico b/example/browser-ipc-on-emit/go-composite-type/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-ipc-on-emit/go-composite-type/resources/icon.ico and b/example/browser-ipc-on-emit/go-composite-type/resources/icon.ico differ diff --git a/example/browser-ipc-on-emit/go-composite-type/resources/icon.png b/example/browser-ipc-on-emit/go-composite-type/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-ipc-on-emit/go-composite-type/resources/icon.png differ diff --git a/example/browser-ipc-on-emit/go-to-js/go-to-js.go b/example/browser-ipc-on-emit/go-to-js/go-to-js.go index 7cbb702cb8010501327cbb37063e82b12da1ad8b..5d3e0827371a528af4a19c3d5869b6114e878fc4 100644 --- a/example/browser-ipc-on-emit/go-to-js/go-to-js.go +++ b/example/browser-ipc-on-emit/go-to-js/go-to-js.go @@ -7,6 +7,7 @@ import ( "github.com/energye/energy/v2/cef" "github.com/energye/energy/v2/cef/ipc" "github.com/energye/energy/v2/cef/ipc/context" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/pkgs/assetserve" "strings" ) @@ -22,7 +23,11 @@ func main() { //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/go-to-js.html" cef.BrowserWindow.Config.Title = "Energy - go on event - js emit event" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } //在go中监听一个事件, 不带返回值 //使用上下文获取参数 diff --git a/example/browser-ipc-on-emit/go-to-js/resources/icon.ico b/example/browser-ipc-on-emit/go-to-js/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-ipc-on-emit/go-to-js/resources/icon.ico and b/example/browser-ipc-on-emit/go-to-js/resources/icon.ico differ diff --git a/example/browser-ipc-on-emit/go-to-js/resources/icon.png b/example/browser-ipc-on-emit/go-to-js/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-ipc-on-emit/go-to-js/resources/icon.png differ diff --git a/example/browser-ipc-on-emit/js-to-go/js-to-go.go b/example/browser-ipc-on-emit/js-to-go/js-to-go.go index 3189f27485b1de689fe8902ce8cb528400ce2327..1cfe98191c6aa6739ee85243c9e7859350f96ffa 100644 --- a/example/browser-ipc-on-emit/js-to-go/js-to-go.go +++ b/example/browser-ipc-on-emit/js-to-go/js-to-go.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/energye/energy/v2/cef" "github.com/energye/energy/v2/cef/ipc" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/pkgs/assetserve" "time" ) @@ -20,7 +21,11 @@ func main() { //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/js-to-go.html" cef.BrowserWindow.Config.Title = "Energy - js on event - go emit event" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } //内置http服务链接安全配置 cef.SetBrowserProcessStartAfterCallback(func(b bool) { diff --git a/example/browser-ipc-on-emit/js-to-go/resources/icon.ico b/example/browser-ipc-on-emit/js-to-go/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-ipc-on-emit/js-to-go/resources/icon.ico and b/example/browser-ipc-on-emit/js-to-go/resources/icon.ico differ diff --git a/example/browser-ipc-on-emit/js-to-go/resources/icon.png b/example/browser-ipc-on-emit/js-to-go/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-ipc-on-emit/js-to-go/resources/icon.png differ diff --git a/example/browser-key-event/key-event.go b/example/browser-key-event/key-event.go index eec4b14816d0e3e10f0e36727b11398f1f87040e..2f085a0e652fb1d6d78df7d04700ca8ee7ee544a 100644 --- a/example/browser-key-event/key-event.go +++ b/example/browser-key-event/key-event.go @@ -4,6 +4,7 @@ import ( "embed" "fmt" "github.com/energye/energy/v2/cef" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/consts" "github.com/energye/energy/v2/pkgs/assetserve" "github.com/energye/golcl/lcl" @@ -20,7 +21,11 @@ func main() { //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/key-event.html" cef.BrowserWindow.Config.Title = "Energy - Key Event" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } //在主窗口初始化回调函数里设置浏览器事件 cef.BrowserWindow.SetBrowserInit(func(event *cef.BrowserEvent, browserWindow cef.IBrowserWindow) { event.SetOnKeyEvent(func(sender lcl.IObject, browser *cef.ICefBrowser, event *cef.TCefKeyEvent, osEvent *consts.TCefEventHandle, result *bool) { diff --git a/example/browser-key-event/resources/icon.ico b/example/browser-key-event/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-key-event/resources/icon.ico and b/example/browser-key-event/resources/icon.ico differ diff --git a/example/browser-key-event/resources/icon.png b/example/browser-key-event/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-key-event/resources/icon.png differ diff --git a/example/browser-load-html-url/load-html-url.go b/example/browser-load-html-url/load-html-url.go index 5568effacba6688d057078de7df4b7f2db33c583..de3bdc59efd4e264bf7c3915df4bc48f64a9ba50 100644 --- a/example/browser-load-html-url/load-html-url.go +++ b/example/browser-load-html-url/load-html-url.go @@ -1,14 +1,19 @@ package main import ( + "embed" "github.com/energye/energy/v2/cef" + "github.com/energye/energy/v2/common" "os" "path" ) +//go:embed resources +var resources embed.FS + func main() { //全局初始化 每个应用都必须调用的 - cef.GlobalInit(nil, nil) + cef.GlobalInit(nil, &resources) //创建应用 cefApp := cef.NewApplication() wd, _ := os.Getwd() @@ -17,6 +22,11 @@ func main() { //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = indexHtmlPath cef.BrowserWindow.Config.Title = "Energy 本地加载html" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } //运行应用 cef.Run(cefApp) } diff --git a/example/browser-load-html-url/resources/icon.ico b/example/browser-load-html-url/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-load-html-url/resources/icon.ico and b/example/browser-load-html-url/resources/icon.ico differ diff --git a/example/browser-load-html-url/resources/icon.png b/example/browser-load-html-url/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-load-html-url/resources/icon.png differ diff --git a/example/browser-msgbox/msgbox.go b/example/browser-msgbox/msgbox.go index 0645b151a1b8d27289929c68e29c4696037c7bb0..9177cf9b424d70cc0d3e99c243f92f0dcc4253b4 100644 --- a/example/browser-msgbox/msgbox.go +++ b/example/browser-msgbox/msgbox.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/energye/energy/v2/cef" "github.com/energye/energy/v2/cef/ipc" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/pkgs/assetserve" "github.com/energye/golcl/lcl" "github.com/energye/golcl/lcl/types" @@ -23,7 +24,11 @@ func main() { //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/msgbox.html" cef.BrowserWindow.Config.Title = "Energy - msgbox" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } //内置http服务链接安全配置 cef.SetBrowserProcessStartAfterCallback(func(b bool) { diff --git a/example/browser-msgbox/resources/icon.ico b/example/browser-msgbox/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-msgbox/resources/icon.ico and b/example/browser-msgbox/resources/icon.ico differ diff --git a/example/browser-msgbox/resources/icon.png b/example/browser-msgbox/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-msgbox/resources/icon.png differ diff --git a/example/browser-popup-sub-window/popup-sub-window.go b/example/browser-popup-sub-window/popup-sub-window.go index 9cb3a8c547f648203ae10e8708c553a70323c33c..84dabb441a6fda271c7ce7306d89ded2b1236665 100644 --- a/example/browser-popup-sub-window/popup-sub-window.go +++ b/example/browser-popup-sub-window/popup-sub-window.go @@ -4,6 +4,7 @@ import ( "embed" "fmt" "github.com/energye/energy/v2/cef" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/pkgs/assetserve" "github.com/energye/golcl/lcl" "strings" @@ -19,7 +20,11 @@ func main() { cefApp := cef.NewApplication() //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/index.html" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } cef.BrowserWindow.SetBrowserInit(func(event *cef.BrowserEvent, window cef.IBrowserWindow) { //弹出子窗口 event.SetOnBeforePopup(func(sender lcl.IObject, browser *cef.ICefBrowser, frame *cef.ICefFrame, beforePopupInfo *cef.BeforePopupInfo, popupWindow cef.IBrowserWindow, noJavascriptAccess *bool) bool { diff --git a/example/browser-popup-sub-window/resources/icon.ico b/example/browser-popup-sub-window/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-popup-sub-window/resources/icon.ico and b/example/browser-popup-sub-window/resources/icon.ico differ diff --git a/example/browser-popup-sub-window/resources/icon.png b/example/browser-popup-sub-window/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-popup-sub-window/resources/icon.png differ diff --git a/example/browser-print-pdf/print-pdf.go b/example/browser-print-pdf/print-pdf.go index f1ed60edd0f707bc5fac343fb27013accad65f0d..456249dd73f9640f4f64fa434e42a9943a985a60 100644 --- a/example/browser-print-pdf/print-pdf.go +++ b/example/browser-print-pdf/print-pdf.go @@ -6,6 +6,7 @@ import ( "github.com/energye/energy/v2/cef" "github.com/energye/energy/v2/cef/ipc" "github.com/energye/energy/v2/cef/ipc/context" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/pkgs/assetserve" "github.com/energye/golcl/lcl" "os" @@ -22,7 +23,11 @@ func main() { cefApp := cef.NewApplication() //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/index.html" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } cef.BrowserWindow.Config.Title = "Energy 打印PFD预览" cef.SetBrowserProcessStartAfterCallback(func(b bool) { fmt.Println("主进程启动 创建一个内置http服务") diff --git a/example/browser-print-pdf/resources/icon.ico b/example/browser-print-pdf/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-print-pdf/resources/icon.ico and b/example/browser-print-pdf/resources/icon.ico differ diff --git a/example/browser-print-pdf/resources/icon.png b/example/browser-print-pdf/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-print-pdf/resources/icon.png differ diff --git a/example/browser-process-type/process-type.go b/example/browser-process-type/process-type.go index 14a334bc5fa54738fb71aa79e9ed8f4b259d54be..1f3c1060da3237ab9e9d921f0db65337644c8607 100644 --- a/example/browser-process-type/process-type.go +++ b/example/browser-process-type/process-type.go @@ -3,6 +3,7 @@ package main import ( "github.com/energye/energy/v2/cef" "github.com/energye/energy/v2/cef/process" + "github.com/energye/energy/v2/common" ) func main() { @@ -27,6 +28,11 @@ func main() { cefApp := cef.NewApplication() //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "https://energy.yanghy.cn" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } //运行应用 cef.Run(cefApp) } diff --git a/example/browser-proxy/resources/icon.ico b/example/browser-proxy/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-proxy/resources/icon.ico and b/example/browser-proxy/resources/icon.ico differ diff --git a/example/browser-proxy/resources/icon.png b/example/browser-proxy/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-proxy/resources/icon.png differ diff --git a/example/browser-response-filter/resources/icon.ico b/example/browser-response-filter/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-response-filter/resources/icon.ico and b/example/browser-response-filter/resources/icon.ico differ diff --git a/example/browser-response-filter/resources/icon.png b/example/browser-response-filter/resources/icon.png index ba865e378383fd9e6a34601754b326f6eee5e3fd..c201354e44f45f95d026d5c528dbdc88593513da 100644 Binary files a/example/browser-response-filter/resources/icon.png and b/example/browser-response-filter/resources/icon.png differ diff --git a/example/browser-scheme/resources/icon.ico b/example/browser-scheme/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-scheme/resources/icon.ico and b/example/browser-scheme/resources/icon.ico differ diff --git a/example/browser-scheme/resources/icon.png b/example/browser-scheme/resources/icon.png index ba865e378383fd9e6a34601754b326f6eee5e3fd..c201354e44f45f95d026d5c528dbdc88593513da 100644 Binary files a/example/browser-scheme/resources/icon.png and b/example/browser-scheme/resources/icon.png differ diff --git a/example/browser-search-text/resources/icon.ico b/example/browser-search-text/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-search-text/resources/icon.ico and b/example/browser-search-text/resources/icon.ico differ diff --git a/example/browser-search-text/resources/icon.png b/example/browser-search-text/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-search-text/resources/icon.png differ diff --git a/example/browser-search-text/seach-text.go b/example/browser-search-text/seach-text.go index 33072d2913256a9cf77fac16dccbc8193939f500..1894f4f541011ccdbd37feeba8ac31200ba82a88 100644 --- a/example/browser-search-text/seach-text.go +++ b/example/browser-search-text/seach-text.go @@ -6,6 +6,7 @@ import ( "github.com/energye/energy/v2/cef" "github.com/energye/energy/v2/cef/ipc" "github.com/energye/energy/v2/cef/ipc/context" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/pkgs/assetserve" "github.com/energye/golcl/lcl" ) @@ -20,8 +21,12 @@ func main() { cefApp := cef.NewApplication() //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/index.html" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" cef.BrowserWindow.Config.Title = "Energy 搜索页面中文本" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } cef.SetBrowserProcessStartAfterCallback(func(b bool) { fmt.Println("主进程启动 创建一个内置http服务") //通过内置http服务加载资源 diff --git a/example/browser-sysdialog/resources/icon.ico b/example/browser-sysdialog/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-sysdialog/resources/icon.ico and b/example/browser-sysdialog/resources/icon.ico differ diff --git a/example/browser-sysdialog/resources/icon.png b/example/browser-sysdialog/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-sysdialog/resources/icon.png differ diff --git a/example/browser-sysdialog/sysdialog.go b/example/browser-sysdialog/sysdialog.go index 259c200f203d3f5769554a3fc24011757ac3fb7a..a75f830b40fb4e779b4fa57ee41c97aff2cc8a70 100644 --- a/example/browser-sysdialog/sysdialog.go +++ b/example/browser-sysdialog/sysdialog.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/energye/energy/v2/cef" "github.com/energye/energy/v2/cef/ipc" + "github.com/energye/energy/v2/common" "github.com/energye/energy/v2/pkgs/assetserve" "github.com/energye/golcl/lcl" "github.com/energye/golcl/lcl/types" @@ -23,7 +24,11 @@ func main() { //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/sysdialog.html" cef.BrowserWindow.Config.Title = "Energy - sysdialog" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } //内置http服务链接安全配置 cef.SetBrowserProcessStartAfterCallback(func(b bool) { diff --git a/example/browser-vue/resources/icon.ico b/example/browser-vue/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-vue/resources/icon.ico and b/example/browser-vue/resources/icon.ico differ diff --git a/example/browser-vue/resources/icon.png b/example/browser-vue/resources/icon.png index ba865e378383fd9e6a34601754b326f6eee5e3fd..c201354e44f45f95d026d5c528dbdc88593513da 100644 Binary files a/example/browser-vue/resources/icon.png and b/example/browser-vue/resources/icon.png differ diff --git a/example/browser-webkit-register/resources/icon.ico b/example/browser-webkit-register/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-webkit-register/resources/icon.ico and b/example/browser-webkit-register/resources/icon.ico differ diff --git a/example/browser-webkit-register/resources/icon.png b/example/browser-webkit-register/resources/icon.png index ba865e378383fd9e6a34601754b326f6eee5e3fd..c201354e44f45f95d026d5c528dbdc88593513da 100644 Binary files a/example/browser-webkit-register/resources/icon.png and b/example/browser-webkit-register/resources/icon.png differ diff --git a/example/browser-zoom/resources/icon.ico b/example/browser-zoom/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/browser-zoom/resources/icon.ico and b/example/browser-zoom/resources/icon.ico differ diff --git a/example/browser-zoom/resources/icon.png b/example/browser-zoom/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/browser-zoom/resources/icon.png differ diff --git a/example/sub-process/main-process/resources/icon.ico b/example/sub-process/main-process/resources/icon.ico index 15488cda83df2add53a05fbd651249c8deb3ab29..6f824a35d35213e8683b2dfd29acb2ad4f458739 100644 Binary files a/example/sub-process/main-process/resources/icon.ico and b/example/sub-process/main-process/resources/icon.ico differ diff --git a/example/sub-process/main-process/resources/icon.png b/example/sub-process/main-process/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c201354e44f45f95d026d5c528dbdc88593513da Binary files /dev/null and b/example/sub-process/main-process/resources/icon.png differ diff --git a/example/sub-process/main-process/src/main-browser.go b/example/sub-process/main-process/src/main-browser.go index a00904909185921f5386046c0bf28bb19124e0f8..da4950b31f0fcbb05f746554242966dad1574cd7 100644 --- a/example/sub-process/main-process/src/main-browser.go +++ b/example/sub-process/main-process/src/main-browser.go @@ -3,6 +3,7 @@ package src import ( "fmt" "github.com/energye/energy/v2/cef" + "github.com/energye/energy/v2/common" "github.com/energye/golcl/lcl" ) @@ -10,8 +11,12 @@ import ( func MainBrowserInit() { //指定一个URL地址，或本地html文件目录 cef.BrowserWindow.Config.Url = "http://localhost:22022/index.html" - cef.BrowserWindow.Config.IconFS = "resources/icon.ico" cef.BrowserWindow.Config.Title = "ENERGY 区分主/子进程执行文件" + if common.IsLinux() { + cef.BrowserWindow.Config.IconFS = "resources/icon.png" + } else { + cef.BrowserWindow.Config.IconFS = "resources/icon.ico" + } //主窗口初始化回调函数 //在这个函数里，主进程浏览初始化之前创建窗口之后