提交 66207864 编写于 作者: yanghye's avatar yanghye

upgrade: Merge branch 'dev'

上级 b974da06
...@@ -66,6 +66,7 @@ func NewViewsFrameworkBrowserWindow(chromiumConfig *tCefChromiumConfig, windowPr ...@@ -66,6 +66,7 @@ func NewViewsFrameworkBrowserWindow(chromiumConfig *tCefChromiumConfig, windowPr
windowComponent: NewWindowComponent(component), windowComponent: NewWindowComponent(component),
browserViewComponent: NewBrowserViewComponent(component), browserViewComponent: NewBrowserViewComponent(component),
} }
m.SetWindowType(windowProperty.WindowType)
m.chromium.SetEnableMultiBrowserMode(true) m.chromium.SetEnableMultiBrowserMode(true)
m.windowComponent.SetOnWindowCreated(func(sender lcl.IObject, window *ICefWindow) { m.windowComponent.SetOnWindowCreated(func(sender lcl.IObject, window *ICefWindow) {
if m.chromium.CreateBrowserByBrowserViewComponent(windowProperty.Url, m.browserViewComponent) { if m.chromium.CreateBrowserByBrowserViewComponent(windowProperty.Url, m.browserViewComponent) {
...@@ -101,6 +102,7 @@ func (m *browser) appContextInitialized(app *TCEFApplication) { ...@@ -101,6 +102,7 @@ func (m *browser) appContextInitialized(app *TCEFApplication) {
return return
} }
app.SetOnContextInitialized(func() { app.SetOnContextInitialized(func() {
m.Config.WindowProperty.WindowType = consts.WT_MAIN_BROWSER
vFrameBrowserWindow := NewViewsFrameworkBrowserWindow(m.Config.ChromiumConfig(), m.Config.WindowProperty) vFrameBrowserWindow := NewViewsFrameworkBrowserWindow(m.Config.ChromiumConfig(), m.Config.WindowProperty)
vFrameBrowserWindow.Chromium().SetOnBeforeClose(func(sender lcl.IObject, browser *ICefBrowser) { vFrameBrowserWindow.Chromium().SetOnBeforeClose(func(sender lcl.IObject, browser *ICefBrowser) {
if vFrameBrowserWindow.tray != nil { if vFrameBrowserWindow.tray != nil {
...@@ -108,7 +110,6 @@ func (m *browser) appContextInitialized(app *TCEFApplication) { ...@@ -108,7 +110,6 @@ func (m *browser) appContextInitialized(app *TCEFApplication) {
} }
}) })
vFrameBrowserWindow.ResetWindowPropertyForEvent() vFrameBrowserWindow.ResetWindowPropertyForEvent()
vFrameBrowserWindow.SetWindowType(consts.WT_MAIN_BROWSER)
vFrameBrowserWindow.windowId = BrowserWindow.GetNextWindowNum() vFrameBrowserWindow.windowId = BrowserWindow.GetNextWindowNum()
vFrameBrowserWindow.putChromiumWindowInfo() vFrameBrowserWindow.putChromiumWindowInfo()
vFrameBrowserWindow.registerPopupEvent() vFrameBrowserWindow.registerPopupEvent()
...@@ -139,6 +140,7 @@ func (m *ViewsFrameworkBrowserWindow) registerPopupEvent() { ...@@ -139,6 +140,7 @@ func (m *ViewsFrameworkBrowserWindow) registerPopupEvent() {
} }
wp := BrowserWindow.Config.WindowProperty wp := BrowserWindow.Config.WindowProperty
wp.Url = beforePopupInfo.TargetUrl wp.Url = beforePopupInfo.TargetUrl
wp.WindowType = consts.WT_POPUP_SUB_BROWSER
var vfbw = NewViewsFrameworkBrowserWindow(BrowserWindow.Config.ChromiumConfig(), wp, BrowserWindow.MainWindow().AsViewsFrameworkBrowserWindow().Component()) var vfbw = NewViewsFrameworkBrowserWindow(BrowserWindow.Config.ChromiumConfig(), wp, BrowserWindow.MainWindow().AsViewsFrameworkBrowserWindow().Component())
var result = false var result = false
if bwEvent.onBeforePopup != nil { if bwEvent.onBeforePopup != nil {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册