Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
energye
energy
提交
cdfbe537
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,体验更适合开发者的 AI 搜索 >>
提交
cdfbe537
编写于
7月 23, 2023
作者:
yanghye
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
U: browser window, full screen
上级
dc3baa62
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
14 deletion
+19
-14
cef/browser-window-lcl.go
cef/browser-window-lcl.go
+18
-12
cef/browser-window-views-framework.go
cef/browser-window-views-framework.go
+1
-2
未找到文件。
cef/browser-window-lcl.go
浏览文件 @
cdfbe537
...
...
@@ -146,7 +146,7 @@ func (m *LCLBrowserWindow) setProperty() {
c
.
SetMinWidth
(
wp
.
MaxHeight
)
}
}
// 只有隐藏窗口标题时才全屏
TODO 拖拽时的问题不还原窗口
// 只有隐藏窗口标题时才全屏
if
wp
.
EnableHideCaption
&&
wp
.
WindowInitState
==
types
.
WsFullScreen
{
m
.
FullScreen
()
}
else
{
...
...
@@ -157,26 +157,33 @@ func (m *LCLBrowserWindow) setProperty() {
}
// FullScreen 窗口全屏
func
(
m
*
LCLBrowserWindow
)
FullScreen
()
bool
{
func
(
m
*
LCLBrowserWindow
)
FullScreen
()
{
if
m
.
WindowProperty
()
.
EnableHideCaption
{
m
.
WindowProperty
()
.
current
.
ws
=
types
.
WsFullScreen
m
.
setCurrentProperty
()
m
.
SetBoundsRect
(
m
.
Monitor
()
.
BoundsRect
())
return
true
m
.
RunOnMainThread
(
func
()
{
m
.
WindowProperty
()
.
current
.
ws
=
types
.
WsFullScreen
m
.
setCurrentProperty
()
m
.
SetBoundsRect
(
m
.
Monitor
()
.
BoundsRect
())
})
}
return
false
}
// ExitFullScreen 窗口退出全屏
func
(
m
*
LCLBrowserWindow
)
ExitFullScreen
()
{
wp
:=
m
.
WindowProperty
()
if
wp
.
EnableHideCaption
&&
wp
.
current
.
ws
==
types
.
WsFullScreen
{
wp
.
current
.
ws
=
types
.
WsNormal
m
.
SetWindowState
(
types
.
WsNormal
)
m
.
SetBounds
(
wp
.
current
.
x
,
wp
.
current
.
y
,
wp
.
current
.
w
,
wp
.
current
.
h
)
m
.
RunOnMainThread
(
func
()
{
wp
.
current
.
ws
=
types
.
WsNormal
m
.
SetWindowState
(
types
.
WsNormal
)
m
.
SetBounds
(
wp
.
current
.
x
,
wp
.
current
.
y
,
wp
.
current
.
w
,
wp
.
current
.
h
)
})
}
}
// IsFullScreen 是否全屏
func
(
m
*
LCLBrowserWindow
)
IsFullScreen
()
bool
{
return
m
.
WindowProperty
()
.
current
.
ws
==
types
.
WsFullScreen
}
// Handle 窗口句柄
func
(
m
*
LCLBrowserWindow
)
Handle
()
types
.
HWND
{
if
m
.
hWnd
==
0
{
...
...
@@ -920,10 +927,9 @@ func (m *LCLBrowserWindow) registerPopupEvent() {
return
true
}
if
next
:=
BrowserWindow
.
getNextLCLPopupWindow
();
next
!=
nil
{
cloneChromiumConfig
:=
*
m
.
Chromium
()
.
Config
()
// clone
bw
:=
next
.
AsLCLBrowserWindow
()
.
BrowserWindow
()
bw
.
SetWindowType
(
consts
.
WT_POPUP_SUB_BROWSER
)
bw
.
ChromiumCreate
(
&
cloneChromiumConfig
,
beforePopupInfo
.
TargetUrl
)
bw
.
ChromiumCreate
(
NewChromiumConfig
()
,
beforePopupInfo
.
TargetUrl
)
var
result
=
false
if
bwEvent
.
onBeforePopup
!=
nil
{
result
=
bwEvent
.
onBeforePopup
(
sender
,
browser
,
frame
,
beforePopupInfo
,
bw
,
noJavascriptAccess
)
...
...
cef/browser-window-views-framework.go
浏览文件 @
cdfbe537
...
...
@@ -183,8 +183,7 @@ func (m *ViewsFrameworkBrowserWindow) registerPopupEvent(isMain bool) {
wp
:=
*
m
.
windowProperty
//clone
wp
.
Url
=
beforePopupInfo
.
TargetUrl
wp
.
WindowType
=
consts
.
WT_POPUP_SUB_BROWSER
cloneChromiumConfig
:=
*
m
.
Chromium
()
.
Config
()
// clone
var
vFrameBrowserWindow
=
NewViewsFrameworkBrowserWindow
(
&
cloneChromiumConfig
,
wp
,
BrowserWindow
.
MainWindow
()
.
AsViewsFrameworkBrowserWindow
()
.
Component
())
var
vFrameBrowserWindow
=
NewViewsFrameworkBrowserWindow
(
NewChromiumConfig
(),
wp
,
BrowserWindow
.
MainWindow
()
.
AsViewsFrameworkBrowserWindow
()
.
Component
())
var
result
=
false
if
bwEvent
.
onBeforePopup
!=
nil
{
result
=
bwEvent
.
onBeforePopup
(
sender
,
browser
,
frame
,
beforePopupInfo
,
vFrameBrowserWindow
,
noJavascriptAccess
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录