Andrew Zambazos
c514e4faec
Track menu popup visibility and propagate zoom level to the popup. Add menu_popup_visible_ flag, SendMenuPopupZoom(), and call it when creating/showing the popup and when adjusting zoom. Make CreateNewTab accept an optional URL and route popup/new-tab flows to it. Prevent per-tab child closes from triggering app shutdown by tracking closing_tab_browsers_ and adding ForgetClosingTabBrowser(). Treat MenuPopup role specially when enabling frame hit-testing. Platform: remove usage of ApplyRoundedBrowserRegion and switch menu popup sizing to use resized client_size helpers (consolidate calculations across Win/Mac/Linux). UI: update menu-popup CSS/JS (new styling, font, zoom formatting API via NebulaMenuPopup.setZoomLevel), wire settings to use nebulaNative.postMessage for new-tab, and remove the static menu-popup.html. Misc: small chrome CSS/JS tweaks and ensure chrome state includes zoomLevel.
86 lines
3.5 KiB
C++
86 lines
3.5 KiB
C++
#pragma once
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <unordered_set>
|
|
#include <vector>
|
|
|
|
#include "browser/tab_manager.h"
|
|
#include "cef/browser_client.h"
|
|
#include "platform/types.h"
|
|
#include "window/nebula_window.h"
|
|
|
|
namespace nebula::app {
|
|
|
|
class NebulaController final : public nebula::window::WindowDelegate,
|
|
public nebula::browser::TabObserver,
|
|
public nebula::cef::BrowserClientDelegate {
|
|
public:
|
|
NebulaController(nebula::platform::AppStartup startup, std::string initial_url);
|
|
~NebulaController() override;
|
|
|
|
bool Create();
|
|
|
|
void OnWindowCreated() override;
|
|
void OnWindowResized(const nebula::window::BrowserLayout& layout) override;
|
|
void OnWindowCloseRequested() override;
|
|
|
|
void OnActiveTabChanged(const nebula::browser::NebulaTab& tab) override;
|
|
|
|
void OnBrowserCreated(nebula::cef::BrowserRole role, CefRefPtr<CefBrowser> browser) override;
|
|
void OnBrowserClosing(nebula::cef::BrowserRole role, CefRefPtr<CefBrowser> browser) override;
|
|
void OnChromeCommand(const std::string& command, const std::string& payload) override;
|
|
void OnContentAddressChanged(CefRefPtr<CefBrowser> browser, const std::string& url) override;
|
|
void OnContentTitleChanged(CefRefPtr<CefBrowser> browser, const std::string& title) override;
|
|
void OnContentLoadingStateChanged(CefRefPtr<CefBrowser> browser, bool is_loading) override;
|
|
void OnContentLoadProgressChanged(CefRefPtr<CefBrowser> browser, double progress) override;
|
|
void OnContentLoadFinished(CefRefPtr<CefBrowser> browser, const std::string& url) override;
|
|
void OnContentFaviconChanged(CefRefPtr<CefBrowser> browser, const std::vector<std::string>& urls) override;
|
|
void OnContentFullscreenChanged(CefRefPtr<CefBrowser> browser, bool fullscreen) override;
|
|
void OnPopupRequested(CefRefPtr<CefBrowser> browser, const std::string& target_url) override;
|
|
bool ShouldBypassInsecureWarning(CefRefPtr<CefBrowser> browser, const std::string& target_url) override;
|
|
|
|
private:
|
|
void CreateNewTab(std::string url = {});
|
|
void ActivateTab(int tab_id);
|
|
void CloseTab(int tab_id);
|
|
void CreateChromeBrowser();
|
|
void CreateContentBrowser();
|
|
void ToggleMenuPopup();
|
|
void CloseMenuPopup();
|
|
void CreateMenuPopupBrowser();
|
|
void PositionMenuPopup();
|
|
void SendMenuPopupZoom();
|
|
void ToggleDevTools();
|
|
void AdjustZoom(double delta);
|
|
void FreshReload();
|
|
void SetContentFullscreen(bool fullscreen);
|
|
void ResizeBrowsers();
|
|
void SendChromeState(const nebula::browser::NebulaTab& tab);
|
|
void RecordSiteHistory(const std::string& url);
|
|
void InjectSettingsHistory(CefRefPtr<CefBrowser> browser);
|
|
void PersistSession() const;
|
|
void MaybeFinishShutdown();
|
|
bool ForgetClosingTabBrowser(CefRefPtr<CefBrowser> browser);
|
|
|
|
nebula::platform::AppStartup startup_;
|
|
std::string initial_url_;
|
|
bool closing_ = false;
|
|
bool chrome_ready_ = false;
|
|
bool content_fullscreen_ = false;
|
|
bool menu_popup_visible_ = false;
|
|
|
|
std::unique_ptr<nebula::window::NebulaWindow> window_;
|
|
nebula::browser::TabManager tabs_;
|
|
CefRefPtr<CefBrowser> chrome_browser_;
|
|
CefRefPtr<CefBrowser> menu_popup_browser_;
|
|
CefRefPtr<nebula::cef::NebulaBrowserClient> chrome_client_;
|
|
CefRefPtr<nebula::cef::NebulaBrowserClient> content_client_;
|
|
CefRefPtr<nebula::cef::NebulaBrowserClient> menu_popup_client_;
|
|
std::vector<CefRefPtr<CefBrowser>> closing_tab_browsers_;
|
|
std::unordered_set<std::string> insecure_warning_bypasses_;
|
|
std::vector<std::string> site_history_;
|
|
};
|
|
|
|
} // namespace nebula::app
|