Fix Developer Tools

Author: cztomczak

cef/browser_window.cpp

@@ -104,7 +104,7 @@ BrowserWindow::BrowserWindow(HWND inWindowHandle, bool isPopup)
     SetIconFromSettings();
 
     if (IsPopup()) {
-        LOGGER_DEBUG << "BrowserWindow::BrowserWindow() created for Popup";
+        LOGGER_DEBUG << "Create browser window for popup, hwnd=" << (uintptr_t) inWindowHandle;
     } else {
         if (!CreateBrowserControl(Utf8ToWide(GetWebServerUrl()).c_str())) {
             FatalError(windowHandle_, "Could not create Browser control.\n"

cef/client_handler.cpp

@@ -213,7 +213,7 @@ bool ClientHandler::OnBeforePopup(CefRefPtr<CefBrowser> browser,
                             CefBrowserSettings& settings,
                             CefRefPtr<CefDictionaryValue>& extra_info,
                             bool* no_javascript_access) {
-    LOGGER_DEBUG << "ClientHandler::OnBeforePopup()";
+    LOGGER_DEBUG << "Before popup is created";
     // OnBeforePopup does not get called for the DevTools popup window.
     // The devtools window is created using CreatePopupWindow
     // ----

cef/devtools.cpp

@@ -8,17 +8,44 @@
 #include "../logger.h"
 #include "../string_utils.h"
 #include "../popup_window.h"
+#include "../settings.h"
 
-bool ShowDevTools(CefRefPtr<CefBrowser> browser) {
-    CefWindowInfo windowInfo;
-    CefBrowserSettings settings;
+bool ShowDevTools(CefRefPtr<CefBrowser> browser)
+{
+    LOGGER_DEBUG << "Show DevTools";
+
+    json_value* settings = GetApplicationSettings();
+    std::string runtime_style = (*settings)["chrome"]["runtime_style"];
+
+    CefWindowInfo window_info;
+    CefBrowserSettings browser_settings;
+
+    if (runtime_style == "alloy") {
+        LOGGER_INFO << "Runtime style: alloy";
+        window_info.runtime_style = CEF_RUNTIME_STYLE_ALLOY;
+    } else if (runtime_style == "chrome") {
+        LOGGER_INFO << "Runtime style: chrome";
+        window_info.runtime_style = CEF_RUNTIME_STYLE_CHROME;
+    } else {
+        LOGGER_INFO << "Invalid runtime style in settings.json: " << runtime_style;
+        window_info.runtime_style = CEF_RUNTIME_STYLE_ALLOY;
+    }
 
-    #if defined(OS_WIN)
-    windowInfo.SetAsPopup(browser->GetHost()->GetWindowHandle(), "DevTools");
-    #endif
+    HWND popup_handle = CreatePopupWindow(browser->GetHost()->GetWindowHandle());
+    if (!popup_handle) {
+        LOGGER_ERROR << "Failed to create popup window";
+        return false;
+    }
+    window_info.SetAsPopup(popup_handle, "DevTools");
+
+    browser->GetHost()->ShowDevTools(window_info, nullptr,
+                                     browser_settings, CefPoint());
+
+    BrowserWindow* browser_window = GetBrowserWindow(popup_handle);
+    if (browser_window) {
+        browser_window->SetTitle(L"DevTools");
+    }
 
-    browser->GetHost()->ShowDevTools(windowInfo, browser->GetHost()->GetClient(),
-                                     settings, CefPoint());
     return true;
 }