Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
energye
energy
提交
c052e72b
energy
项目概览
energye
/
energy
通知
13
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
energy
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c052e72b
编写于
12月 07, 2022
作者:
yanghye
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
upgrade: Cannot run is being upgraded, v7
上级
a47adbc7
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
73 addition
and
7 deletion
+73
-7
cef/cef-base-browser-window.go
cef/cef-base-browser-window.go
+4
-0
cef/cef-chromium-proc.go
cef/cef-chromium-proc.go
+49
-3
cef/cef-chromium.go
cef/cef-chromium.go
+1
-1
cef/cef-proc-def.go
cef/cef-proc-def.go
+16
-0
cef/cef-v8-i.go
cef/cef-v8-i.go
+1
-1
cef/cef-v8-js-array.go
cef/cef-v8-js-array.go
+1
-1
cef/cef-v8-js-object.go
cef/cef-v8-js-object.go
+1
-1
未找到文件。
cef/cef-base-browser-window.go
浏览文件 @
c052e72b
...
...
@@ -246,6 +246,7 @@ func (m *BaseWindow) SetOnActivateAfter(fn lcl.TNotifyEvent) {
}
func
(
m
*
BaseWindow
)
close
(
sender
lcl
.
IObject
,
action
*
types
.
TCloseAction
)
{
fmt
.
Println
(
"close"
)
var
ret
bool
if
m
.
onClose
!=
nil
{
for
_
,
fn
:=
range
m
.
onClose
{
...
...
@@ -274,6 +275,7 @@ func (m *BaseWindow) closeQuery(sender lcl.IObject, close *bool) {
m
.
isClosing
=
true
m
.
Hide
()
m
.
chromium
.
CloseBrowser
(
true
)
fmt
.
Println
(
"closeQuery"
)
}
}
}
...
...
@@ -454,6 +456,7 @@ func (m *BaseWindow) registerDefaultEvent() {
func
(
m
*
BaseWindow
)
registerDefaultChromiumCloseEvent
()
{
var
bwEvent
=
BrowserWindow
.
browserEvent
m
.
chromium
.
SetOnClose
(
func
(
sender
lcl
.
IObject
,
browser
*
ICefBrowser
,
aAction
*
TCefCloseBrowsesAction
)
{
fmt
.
Println
(
"SetOnClose"
)
if
IsDarwin
()
{
//MacOSX
m
.
windowParent
.
DestroyChildWindow
()
}
else
{
// Window and Linux
...
...
@@ -473,6 +476,7 @@ func (m *BaseWindow) registerDefaultChromiumCloseEvent() {
}
})
m
.
chromium
.
SetOnBeforeClose
(
func
(
sender
lcl
.
IObject
,
browser
*
ICefBrowser
)
{
fmt
.
Println
(
"SetOnBeforeClose"
)
m
.
canClose
=
true
var
tempClose
=
func
()
{
defer
func
()
{
...
...
cef/cef-chromium-proc.go
浏览文件 @
c052e72b
...
...
@@ -14,6 +14,7 @@ import (
"github.com/energye/energy/ipc"
"github.com/energye/golcl/lcl"
"github.com/energye/golcl/lcl/api"
"github.com/energye/golcl/lcl/types"
"strings"
"time"
"unsafe"
...
...
@@ -68,6 +69,53 @@ type IChromiumProc interface {
FrameIsFocused
()
bool
}
func
(
m
*
TCEFChromium
)
IsValid
()
bool
{
return
m
.
instance
!=
nil
}
func
(
m
*
TCEFChromium
)
UnsafeAddr
()
unsafe
.
Pointer
{
return
m
.
instance
}
func
(
m
*
TCEFChromium
)
ClassName
()
string
{
r1
,
_
,
_
:=
Proc
(
internale_CEFChromium_ClassName
)
.
Call
()
return
api
.
GoStr
(
r1
)
}
func
(
m
*
TCEFChromium
)
Free
()
{
Proc
(
internale_CEFChromium_Free
)
.
Call
()
}
func
(
m
*
TCEFChromium
)
GetHashCode
()
int32
{
r1
,
_
,
_
:=
Proc
(
internale_CEFChromium_GetHashCode
)
.
Call
()
return
int32
(
r1
)
}
func
(
m
*
TCEFChromium
)
Equals
(
object
lcl
.
IObject
)
bool
{
r1
,
_
,
_
:=
Proc
(
internale_CEFChromium_Equals
)
.
Call
(
lcl
.
CheckPtr
(
object
))
return
api
.
GoBool
(
r1
)
}
func
(
m
*
TCEFChromium
)
ClassType
()
types
.
TClass
{
r1
,
_
,
_
:=
Proc
(
internale_CEFChromium_ClassType
)
.
Call
()
return
types
.
TClass
(
r1
)
}
func
(
m
*
TCEFChromium
)
InstanceSize
()
int32
{
r1
,
_
,
_
:=
Proc
(
internale_CEFChromium_InstanceSize
)
.
Call
()
return
int32
(
r1
)
}
func
(
m
*
TCEFChromium
)
InheritsFrom
(
class
types
.
TClass
)
bool
{
r1
,
_
,
_
:=
Proc
(
internale_CEFChromium_InheritsFrom
)
.
Call
(
uintptr
(
class
))
return
api
.
GoBool
(
r1
)
}
func
(
m
*
TCEFChromium
)
ToString
()
string
{
r1
,
_
,
_
:=
Proc
(
internale_CEFChromium_ToString
)
.
Call
()
return
api
.
GoStr
(
r1
)
}
func
(
m
*
TCEFChromium
)
SetDefaultURL
(
defaultURL
string
)
{
if
IsLinux
()
||
IsDarwin
()
{
httpIdx
:=
strings
.
Index
(
defaultURL
,
"http"
)
...
...
@@ -178,9 +226,7 @@ func (m *TCEFChromium) NotifyMoveOrResizeStarted() {
}
func
(
m
*
TCEFChromium
)
CloseBrowser
(
forceClose
bool
)
{
if
m
.
IsValid
()
{
_CEFChromium_CloseBrowser
(
m
.
Instance
(),
api
.
PascalBool
(
forceClose
))
}
_CEFChromium_CloseBrowser
(
m
.
Instance
(),
api
.
PascalBool
(
forceClose
))
}
func
(
m
*
TCEFChromium
)
ShowDevTools
(
window
ITCefWindow
)
{
...
...
cef/cef-chromium.go
浏览文件 @
c052e72b
...
...
@@ -48,7 +48,7 @@ type IChromium interface {
}
type
TCEFChromium
struct
{
lcl
.
TComponent
*
lcl
.
TComponent
instance
unsafe
.
Pointer
cfg
*
tCefChromiumConfig
independentEvent
bool
...
...
cef/cef-proc-def.go
浏览文件 @
c052e72b
...
...
@@ -186,6 +186,14 @@ func init() {
dllimports
.
NewEnergyImport
(
"CEFChromium_SetOnBeforePopup"
,
0
),
dllimports
.
NewEnergyImport
(
"CEFChromium_SetOnOpenUrlFromTab"
,
0
),
//TCEFChromium - proc
dllimports
.
NewEnergyImport
(
"CEFChromium_Free"
,
0
),
dllimports
.
NewEnergyImport
(
"CEFChromium_GetHashCode"
,
0
),
dllimports
.
NewEnergyImport
(
"CEFChromium_ClassName"
,
0
),
dllimports
.
NewEnergyImport
(
"CEFChromium_Equals"
,
0
),
dllimports
.
NewEnergyImport
(
"CEFChromium_ClassType"
,
0
),
dllimports
.
NewEnergyImport
(
"CEFChromium_InstanceSize"
,
0
),
dllimports
.
NewEnergyImport
(
"CEFChromium_InheritsFrom"
,
0
),
dllimports
.
NewEnergyImport
(
"CEFChromium_ToString"
,
0
),
dllimports
.
NewEnergyImport
(
"CEFChromium_Create"
,
0
),
dllimports
.
NewEnergyImport
(
"CEFChromium_SetDefaultURL"
,
0
),
dllimports
.
NewEnergyImport
(
"CEFChromium_SetMultiBrowserMode"
,
0
),
...
...
@@ -482,6 +490,14 @@ const (
internale_CEFChromium_SetOnBeforePopup
internale_CEFChromium_SetOnOpenUrlFromTab
//TCEFChromium - proc
internale_CEFChromium_Free
internale_CEFChromium_GetHashCode
internale_CEFChromium_ClassName
internale_CEFChromium_Equals
internale_CEFChromium_ClassType
internale_CEFChromium_InstanceSize
internale_CEFChromium_InheritsFrom
internale_CEFChromium_ToString
internale_CEFChromium_Create
internale_CEFChromium_SetDefaultURL
internale_CEFChromium_SetMultiBrowserMode
...
...
cef/cef-v8-i.go
浏览文件 @
c052e72b
...
...
@@ -66,7 +66,7 @@ type JSValue interface {
//
//主进程创建完之后和渲染进程每次创建之后调用
//
//
TODO
潜在问题,如果函数名包含数字可能会引起函数冲突,入参或出参类型不正确,导致调用失败
//潜在问题,如果函数名包含数字可能会引起函数冲突,入参或出参类型不正确,导致调用失败
func
bindGoToJS
(
browser
*
ICefBrowser
,
frame
*
ICefFrame
)
{
//变量绑定回调函数
VariableBind
.
callVariableBind
(
browser
,
frame
)
...
...
cef/cef-v8-js-array.go
浏览文件 @
c052e72b
...
...
@@ -8,7 +8,7 @@
package
cef
//
TODO
先保留 未添加
//先保留 未添加
type
JSArray
struct
{
ICEFv8Value
}
cef/cef-v8-js-object.go
浏览文件 @
c052e72b
...
...
@@ -8,7 +8,7 @@
package
cef
//
TODO
先保留 未添加
//先保留 未添加
type
JSObject
struct
{
ICEFv8Value
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录