beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Ladybird: Ensure hamburger menu is placed within the browser window

Browse source
This commit is contained in:
MacDue 2024-05-07 23:39:25 +01:00 committed by Andreas Kling
parent e10721f1b5
commit 563d392db7
Notes: sideshowbarker 2024-07-16 23:13:25 +09:00 
Author: https://github.com/MacDue
Commit: https://github.com/SerenityOS/serenity/commit/563d392db7
Pull-request: https://github.com/SerenityOS/serenity/pull/24257
3 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Ladybird/Qt/BrowserWindow.cpp
View file

@ -46,6 +46,28 @@ static QIcon const& app_icon()
return icon;
}
class HamburgerMenu : public QMenu {
public:
using QMenu::QMenu;
virtual ~HamburgerMenu() override = default;
virtual void showEvent(QShowEvent*) override
{
if (!isVisible())
return;
auto* browser_window = verify_cast<BrowserWindow>(parentWidget());
if (!browser_window)
return;
auto* current_tab = browser_window->current_tab();
if (!current_tab)
return;
// Ensure the hamburger menu placed within the browser window.
auto* hamburger_button = current_tab->hamburger_button();
auto button_top_right = hamburger_button->mapToGlobal(hamburger_button->rect().bottomRight());
move(button_top_right - QPoint(rect().width(), 0));
}
};
BrowserWindow::BrowserWindow(Vector<URL::URL> const& initial_urls, WebView::CookieJar& cookie_jar, WebContentOptions const& web_content_options, StringView webdriver_content_ipc_path)
: m_tabs_container(new TabWidget(this))
, m_cookie_jar(cookie_jar)
@ -72,7 +94,7 @@ BrowserWindow::BrowserWindow(Vector<URL::URL> const& initial_urls, WebView::Cook
});
}
m_hamburger_menu = new QMenu(this);
m_hamburger_menu = new HamburgerMenu(this);
if (!Settings::the()->show_menubar())
menuBar()->hide();

2
Ladybird/Qt/BrowserWindow.h
View file

@ -93,6 +93,8 @@ public:
return *m_inspect_dom_node_action;
}
Tab* current_tab() const { return m_current_tab; }
public slots:
void device_pixel_ratio_changed(qreal dpi);
void tab_title_changed(int index, QString const&);

2
Ladybird/Qt/Tab.h
View file

@ -58,6 +58,8 @@ public:
void update_navigation_buttons_state();
QToolButton* hamburger_button() const { return m_hamburger_button; }
public slots:
void focus_location_editor();
void location_edit_return_pressed();