1. Notify CEF about window's visible when each MainFrame load finished.

2. Using XXX.XXX.XXX to manage version.
WilliamQf-AI · Aug 31, 2020 · 6e06e31 · 6e06e31
1 parent e98111b
commit 6e06e31
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/src/QCefWidget/CefBrowserApp/QCefBrowserHandler.cpp b/src/QCefWidget/CefBrowserApp/QCefBrowserHandler.cpp
@@ -419,18 +419,23 @@ void QCefBrowserHandler::OnLoadEnd(CefRefPtr<CefBrowser> browser,
                                    int httpStatusCode) {
   CEF_REQUIRE_UI_THREAD();
 
-  if (pImpl_->getWidgetType() == WT_Widget) {
-    QCefWidget* p = qobject_cast<QCefWidget*>(pImpl_->getWidget());
-    if (p)
-      emit p->loadEnd(frame->IsMain(), httpStatusCode);
-  }
+  if (pImpl_) {
+    if (pImpl_->getWidgetType() == WT_Widget) {
+      QCefWidget* p = qobject_cast<QCefWidget*>(pImpl_->getWidget());
+      if (p)
+        emit p->loadEnd(frame->IsMain(), httpStatusCode);
+    }
 #ifndef QT_NO_OPENGL
-  else if (pImpl_->getWidgetType() == WT_OpenGLWidget) {
-    QCefOpenGLWidget* p = qobject_cast<QCefOpenGLWidget*>(pImpl_->getWidget());
-    if (p)
-      emit p->loadEnd(frame->IsMain(), httpStatusCode);
-  }
+    else if (pImpl_->getWidgetType() == WT_OpenGLWidget) {
+      QCefOpenGLWidget* p = qobject_cast<QCefOpenGLWidget*>(pImpl_->getWidget());
+      if (p)
+        emit p->loadEnd(frame->IsMain(), httpStatusCode);
+    }
 #endif
+    if (frame->IsMain()) {
+      pImpl_->mainFrameLoadFinishedNotify();
+    }
+  }
 }
 
 void QCefBrowserHandler::OnLoadError(CefRefPtr<CefBrowser> browser,

diff --git a/src/QCefWidget/Include/QCefVersion.h b/src/QCefWidget/Include/QCefVersion.h
@@ -0,0 +1,9 @@
+#ifndef QCEF_VERSION_H_
+#define QCEF_VERSION_H_
+#pragma once
+
+#define QCEF_VERSION_MAJOR 1
+#define QCEF_VERSION_MINOR 0
+#define QCEF_VERSION_PATCH 1
+
+#endif // !QCEF_VERSION_H_
diff --git a/src/QCefWidget/QCefWidgetImpl.cpp b/src/QCefWidget/QCefWidgetImpl.cpp
@@ -240,10 +240,6 @@ void QCefWidgetImpl::browserCreatedNotify(CefRefPtr<CefBrowser> browser) {
 
   pTopWidget_ = QCefManager::getInstance().addBrowser(
     pWidget_, this, browser, browserSetting_.osrEnabled);
-
-  // 延时1000ms之后通知CEF当前是否隐藏
-  QTimer::singleShot(
-    1000, this, [this]() { visibleChangedNotify(pWidget_->isVisible()); });
 }
 
 void QCefWidgetImpl::browserClosingNotify(CefRefPtr<CefBrowser> browser) {
@@ -500,6 +496,10 @@ void QCefWidgetImpl::dpiChangedNotify() {
   simulateResizeEvent();
 }
 
+void QCefWidgetImpl::mainFrameLoadFinishedNotify() {
+  visibleChangedNotify(pWidget_->isVisible());
+}
+
 bool QCefWidgetImpl::sendEventNotifyMessage(const QString& name,
                                             const QCefEvent& event) {
   if (!pQCefViewHandler_)

diff --git a/src/QCefWidget/QCefWidgetImpl.h b/src/QCefWidget/QCefWidgetImpl.h
@@ -37,6 +37,7 @@ class QCefWidgetImpl : public QObject {
   bool createDevTools(CefRefPtr<CefBrowser> targetBrowser);
 
   void dpiChangedNotify();
+  void mainFrameLoadFinishedNotify();
 
   void browserClosingNotify(CefRefPtr<CefBrowser> browser);
   void browserCreatedNotify(CefRefPtr<CefBrowser> browser);