nebula-project/NebulaBrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Menu popup: visibility, zoom sync, and tab fixes

Browse Source 
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.
This commit is contained in:
Andrew Zambazos
2026-05-18 18:28:20 +12:00
parent e51594a010
commit c514e4faec
14 changed files with 156 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/nebula_controller.cpp
+79 -15
View File
@@ -155,6 +155,12 @@ void NebulaController::OnWindowResized(const nebula::window::BrowserLayout& layo
}
void NebulaController::OnWindowCloseRequested() {
if (!closing_ && !closing_tab_browsers_.empty()) {
// CEF Alloy can bubble a child browser close as WM_CLOSE on the host
// window. Per-tab closes should not turn into full app shutdown.
return;
}
if (closing_) {
// CEF re-sends WM_CLOSE to the top-level window after each Alloy
// child browser finishes its JS unload + DoClose phase. Destroy the
@@ -193,7 +199,7 @@ void NebulaController::OnActiveTabChanged(const nebula::browser::NebulaTab& tab)
}
void NebulaController::OnBrowserCreated(nebula::cef::BrowserRole role, CefRefPtr<CefBrowser> browser) {
if (window_ && browser) {
if (window_ && browser && role != nebula::cef::BrowserRole::MenuPopup) {
window_->EnableFrameHitTest(browser->GetHost()->GetWindowHandle());
}
@@ -205,7 +211,9 @@ void NebulaController::OnBrowserCreated(nebula::cef::BrowserRole role, CefRefPtr
}
} else if (role == nebula::cef::BrowserRole::MenuPopup) {
menu_popup_browser_ = browser;
menu_popup_visible_ = true;
PositionMenuPopup();
SendMenuPopupZoom();
} else {
tabs_.SetActiveBrowser(browser);
}
@@ -220,7 +228,9 @@ void NebulaController::OnBrowserClosing(nebula::cef::BrowserRole role, CefRefPtr
} else if (role == nebula::cef::BrowserRole::MenuPopup) {
menu_popup_browser_ = nullptr;
menu_popup_client_ = nullptr;
menu_popup_visible_ = false;
} else {
ForgetClosingTabBrowser(browser);
if (content_fullscreen_) {
const auto* active_tab = tabs_.ActiveTab();
if (active_tab && active_tab->browser && active_tab->browser->IsSame(browser)) {
@@ -242,7 +252,7 @@ void NebulaController::OnChromeCommand(const std::string& command, const std::st
tabs_.LoadURL(target);
}
} else if (command == "new-tab") {
CreateNewTab();
CreateNewTab(payload);
} else if (command == "activate-tab") {
ActivateTab(ParseTabId(payload));
} else if (command == "close-tab") {
@@ -354,9 +364,9 @@ void NebulaController::OnPopupRequested(CefRefPtr<CefBrowser> browser, const std
return;
}
tabs_.LoadURL(nebula::ui::IsEmptyOrChromiumNewTabUrl(target_url)
? nebula::ui::GetHomeUrl()
: target_url);
CreateNewTab(nebula::ui::IsEmptyOrChromiumNewTabUrl(target_url)
? nebula::ui::GetHomeUrl()
: target_url);
}
bool NebulaController::ShouldBypassInsecureWarning(CefRefPtr<CefBrowser> browser, const std::string& target_url) {
@@ -373,12 +383,14 @@ bool NebulaController::ShouldBypassInsecureWarning(CefRefPtr<CefBrowser> browser
return true;
}
void NebulaController::CreateNewTab() {
void NebulaController::CreateNewTab(std::string url) {
if (auto* tab = tabs_.ActiveTab()) {
SetBrowserVisible(tab->browser, false);
}
tabs_.CreateTab(nebula::ui::GetHomeUrl());
const std::string target =
url.empty() ? nebula::ui::GetHomeUrl() : nebula::browser::NormalizeNavigationInput(url);
tabs_.CreateTab(target.empty() ? nebula::ui::GetHomeUrl() : target);
PersistSession();
CreateContentBrowser();
}
@@ -415,6 +427,7 @@ void NebulaController::CloseTab(int tab_id) {
CefRefPtr<CefBrowser> closing_browser = tabs_.CloseTab(tab_id);
PersistSession();
if (closing_browser) {
closing_tab_browsers_.push_back(closing_browser);
closing_browser->GetHost()->CloseBrowser(false);
}
@@ -464,22 +477,31 @@ void NebulaController::CreateContentBrowser() {
}
void NebulaController::ToggleMenuPopup() {
if (menu_popup_browser_) {
if (menu_popup_browser_ && menu_popup_visible_) {
CloseMenuPopup();
return;
}
if (menu_popup_browser_) {
menu_popup_visible_ = true;
PositionMenuPopup();
SetBrowserVisible(menu_popup_browser_, true);
SendMenuPopupZoom();
return;
}
CreateMenuPopupBrowser();
}
void NebulaController::CloseMenuPopup() {
if (menu_popup_browser_) {
menu_popup_browser_->GetHost()->CloseBrowser(false);
menu_popup_visible_ = false;
SetBrowserVisible(menu_popup_browser_, false);
}
}
void NebulaController::CreateMenuPopupBrowser() {
if (!window_ || !window_->native_handle()) {
if (!window_ || !window_->native_handle() || content_fullscreen_) {
return;
}
@@ -494,20 +516,34 @@ void NebulaController::CreateMenuPopupBrowser() {
}
void NebulaController::PositionMenuPopup() {
if (content_fullscreen_ || !window_ || !window_->native_handle() || !menu_popup_browser_) {
if (content_fullscreen_ || !window_ || !window_->native_handle() || !menu_popup_browser_ ||
!menu_popup_visible_) {
return;
}
const auto rect =
nebula::platform::MenuPopupRect(window_->native_handle(), window_->CurrentLayout());
const auto browser_window = menu_popup_browser_->GetHost()->GetWindowHandle();
window_->ResizeChild(browser_window, rect);
nebula::platform::ApplyRoundedBrowserRegion(
browser_window,
nebula::platform::ScaleForParentWindow(window_->native_handle(), 28));
nebula::platform::ResizeBrowserWindow(browser_window, rect);
nebula::platform::RaiseBrowserWindow(browser_window);
}
void NebulaController::SendMenuPopupZoom() {
if (!menu_popup_browser_) {
return;
}
double zoom_level = 0.0;
if (const auto* tab = tabs_.ActiveTab(); tab && tab->browser) {
zoom_level = tab->browser->GetHost()->GetZoomLevel();
}
const std::string script =
"window.NebulaMenuPopup && window.NebulaMenuPopup.setZoomLevel(" +
std::to_string(zoom_level) + ");";
menu_popup_browser_->GetMainFrame()->ExecuteJavaScript(script, nebula::ui::GetMenuPopupUrl(), 0);
}
void NebulaController::ToggleDevTools() {
auto* tab = tabs_.ActiveTab();
if (!tab || !tab->browser || !window_ || !window_->native_handle()) {
@@ -534,6 +570,10 @@ void NebulaController::AdjustZoom(double delta) {
CefRefPtr<CefBrowserHost> host = tab->browser->GetHost();
host->SetZoomLevel(host->GetZoomLevel() + delta);
SendMenuPopupZoom();
if (chrome_ready_) {
SendChromeState(*tab);
}
}
void NebulaController::FreshReload() {
@@ -589,6 +629,10 @@ void NebulaController::SendChromeState(const nebula::browser::NebulaTab& tab) {
}
const std::string display_url = GetChromeDisplayUrl(tab.url);
double zoom_level = 0.0;
if (tab.browser) {
zoom_level = tab.browser->GetHost()->GetZoomLevel();
}
std::string tabs_json = "[";
const auto& tabs = tabs_.Tabs();
for (size_t i = 0; i < tabs.size(); ++i) {
@@ -615,6 +659,7 @@ void NebulaController::SendChromeState(const nebula::browser::NebulaTab& tab) {
",\"canGoBack\":" + std::string(tab.CanGoBack() ? "true" : "false") +
",\"canGoForward\":" + std::string(tab.CanGoForward() ? "true" : "false") +
",\"favicon\":\"" + nebula::browser::JsonEscape(tab.favicon_url) + "\"" +
",\"zoomLevel\":" + std::to_string(zoom_level) +
",\"tabs\":" + tabs_json +
"});";
@@ -667,4 +712,23 @@ void NebulaController::MaybeFinishShutdown() {
CefQuitMessageLoop();
}
bool NebulaController::ForgetClosingTabBrowser(CefRefPtr<CefBrowser> browser) {
if (!browser) {
return false;
}
const auto it = std::find_if(
closing_tab_browsers_.begin(),
closing_tab_browsers_.end(),
[browser](const CefRefPtr<CefBrowser>& closing_browser) {
return closing_browser && closing_browser->IsSame(browser);
});
if (it == closing_tab_browsers_.end()) {
return false;
}
closing_tab_browsers_.erase(it);
return true;
}
} // namespace nebula::app
src/app/nebula_controller.h
+5 -1
View File
@@ -41,7 +41,7 @@ public:
bool ShouldBypassInsecureWarning(CefRefPtr<CefBrowser> browser, const std::string& target_url) override;
private:
void CreateNewTab();
void CreateNewTab(std::string url = {});
void ActivateTab(int tab_id);
void CloseTab(int tab_id);
void CreateChromeBrowser();
@@ -50,6 +50,7 @@ private:
void CloseMenuPopup();
void CreateMenuPopupBrowser();
void PositionMenuPopup();
void SendMenuPopupZoom();
void ToggleDevTools();
void AdjustZoom(double delta);
void FreshReload();
@@ -60,12 +61,14 @@ private:
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_;
@@ -74,6 +77,7 @@ private:
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_;
};
src/cef/browser_client.cpp
+3 -2
View File
@@ -51,8 +51,8 @@ bool NebulaBrowserClient::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser
return false;
}
if (role_ != BrowserRole::Chrome && role_ != BrowserRole::MenuPopup &&
role_ != BrowserRole::Content) {
if (role_ != BrowserRole::Chrome && role_ != BrowserRole::Content &&
role_ != BrowserRole::MenuPopup) {
return false;
}
@@ -64,6 +64,7 @@ bool NebulaBrowserClient::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser
command == "navigate-insecure" && IsInsecureInterstitialFrame(frame);
const bool allowed_settings_command =
IsSettingsFrame(frame) && (command == "navigate" ||
command == "new-tab" ||
command == "clear-site-history" ||
command == "clear-search-history");
if (!allowed_insecure_command && !allowed_settings_command) {
src/platform/browser_host.h
-1
View File
@@ -14,7 +14,6 @@ void ResizeBrowserWindow(NativeWindow browser_window, const Rect& rect);
void SetBrowserVisible(NativeWindow browser_window, bool visible);
void RaiseBrowserWindow(NativeWindow browser_window);
Rect MenuPopupRect(NativeWindow parent, const BrowserLayout& layout);
void ApplyRoundedBrowserRegion(NativeWindow browser_window, int corner_radius);
std::string CacheBusterToken();
void DestroyTopLevelWindow(NativeWindow window);
int ScaleForParentWindow(NativeWindow parent, int value);
src/platform/linux/browser_host_linux.cpp
+4 -9
View File
@@ -45,26 +45,21 @@ std::pair<int, int> ParentClientSize(NativeWindow parent) {
}
Rect MenuPopupRect(NativeWindow parent, const BrowserLayout& layout) {
const auto [client_right, client_bottom] = ParentClientSize(parent);
const auto client_size = ParentClientSize(parent);
const int width = 260;
const int height = 258;
const int margin = 12;
const int overlap = 2;
const int x = std::max(0, client_right - width - margin);
const int x = std::max(0, client_size.first - width - margin);
const int y = std::max(0, layout.chrome.y + layout.chrome.height - overlap);
return {
x,
y,
std::min(client_right, x + width) - x,
std::min(client_bottom, y + height) - y,
std::min(client_size.first, x + width) - x,
std::min(client_size.second, y + height) - y,
};
}
void ApplyRoundedBrowserRegion(NativeWindow browser_window, int corner_radius) {
UNREFERENCED_PARAMETER(browser_window);
UNREFERENCED_PARAMETER(corner_radius);
}
std::string CacheBusterToken() {
return "0";
}
src/platform/mac/browser_host_mac.cpp
+4 -9
View File
@@ -43,26 +43,21 @@ std::pair<int, int> ParentClientSize(NativeWindow parent) {
}
Rect MenuPopupRect(NativeWindow parent, const BrowserLayout& layout) {
const auto [client_right, client_bottom] = ParentClientSize(parent);
const auto client_size = ParentClientSize(parent);
const int width = 260;
const int height = 258;
const int margin = 12;
const int overlap = 2;
const int x = std::max(0, client_right - width - margin);
const int x = std::max(0, client_size.first - width - margin);
const int y = std::max(0, layout.chrome.y + layout.chrome.height - overlap);
return {
x,
y,
std::min(client_right, x + width) - x,
std::min(client_bottom, y + height) - y,
std::min(client_size.first, x + width) - x,
std::min(client_size.second, y + height) - y,
};
}
void ApplyRoundedBrowserRegion(NativeWindow browser_window, int corner_radius) {
UNREFERENCED_PARAMETER(browser_window);
UNREFERENCED_PARAMETER(corner_radius);
}
std::string CacheBusterToken() {
return "0";
}
src/platform/win/browser_host_win.cpp
+4 -24
View File
@@ -95,42 +95,22 @@ std::pair<int, int> ParentClientSize(NativeWindow parent) {
}
Rect MenuPopupRect(NativeWindow parent, const BrowserLayout& layout) {
const auto [client_right, client_bottom] = ParentClientSize(parent);
const auto client_size = ParentClientSize(parent);
const int width = ScaleForParentWindow(parent, 260);
const int height = ScaleForParentWindow(parent, 258);
const int margin = ScaleForParentWindow(parent, 12);
const int overlap = ScaleForParentWindow(parent, 2);
const int x = std::max(0, client_right - width - margin);
const int x = std::max(0, client_size.first - width - margin);
const int y = std::max(0, layout.chrome.y + layout.chrome.height - overlap);
return {
x,
y,
std::min(client_right, x + width) - x,
std::min(client_bottom, y + height) - y,
std::min(client_size.first, x + width) - x,
std::min(client_size.second, y + height) - y,
};
}
void ApplyRoundedBrowserRegion(NativeWindow browser_window, int corner_radius) {
const HWND hwnd = AsHwnd(browser_window);
if (!hwnd) {
return;
}
RECT rect = {};
if (!GetClientRect(hwnd, &rect)) {
return;
}
const int width = std::max<LONG>(1, rect.right - rect.left);
const int height = std::max<LONG>(1, rect.bottom - rect.top);
HRGN region = CreateRoundRectRgn(0, 0, width + 1, height + 1, corner_radius, corner_radius);
if (region && !SetWindowRgn(hwnd, region, TRUE)) {
DeleteObject(region);
}
}
std::string CacheBusterToken() {
return std::to_string(GetTickCount64());
}