RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 02:57:44 +00:00
Code Issues Activity Actions

Ladybird: Show current zoom level in view menu

Browse source
This commit is contained in:
MacDue 2023-03-26 18:56:17 +01:00 • committed by Linus Groh
parent b22052c0dd
commit 9dbfba0879
2 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Ladybird/BrowserWindow.cpp
View file

@ -83,23 +83,23 @@ BrowserWindow::BrowserWindow(Browser::CookieJar& cookie_jar, StringView webdrive
view_menu->addSeparator(); view_menu->addSeparator();
auto* zoom_menu = view_menu->addMenu("&Zoom"); m_zoom_menu = view_menu->addMenu("&Zoom");
auto* zoom_in_action = new QAction("Zoom &In", this); auto* zoom_in_action = new QAction("Zoom &In", this);
auto zoom_in_shortcuts = QKeySequence::keyBindings(QKeySequence::StandardKey::ZoomIn); auto zoom_in_shortcuts = QKeySequence::keyBindings(QKeySequence::StandardKey::ZoomIn);
zoom_in_shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_Equal)); zoom_in_shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_Equal));
zoom_in_action->setShortcuts(zoom_in_shortcuts); zoom_in_action->setShortcuts(zoom_in_shortcuts);
zoom_menu->addAction(zoom_in_action); m_zoom_menu->addAction(zoom_in_action);
QObject::connect(zoom_in_action, &QAction::triggered, this, &BrowserWindow::zoom_in); QObject::connect(zoom_in_action, &QAction::triggered, this, &BrowserWindow::zoom_in);
auto* zoom_out_action = new QAction("Zoom &Out", this); auto* zoom_out_action = new QAction("Zoom &Out", this);
zoom_out_action->setShortcuts(QKeySequence::keyBindings(QKeySequence::StandardKey::ZoomOut)); zoom_out_action->setShortcuts(QKeySequence::keyBindings(QKeySequence::StandardKey::ZoomOut));
zoom_menu->addAction(zoom_out_action); m_zoom_menu->addAction(zoom_out_action);
QObject::connect(zoom_out_action, &QAction::triggered, this, &BrowserWindow::zoom_out); QObject::connect(zoom_out_action, &QAction::triggered, this, &BrowserWindow::zoom_out);
auto* reset_zoom_action = new QAction("&Reset Zoom", this); auto* reset_zoom_action = new QAction("&Reset Zoom", this);
reset_zoom_action->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_0)); reset_zoom_action->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_0));
zoom_menu->addAction(reset_zoom_action); m_zoom_menu->addAction(reset_zoom_action);
QObject::connect(reset_zoom_action, &QAction::triggered, this, &BrowserWindow::reset_zoom); QObject::connect(reset_zoom_action, &QAction::triggered, this, &BrowserWindow::reset_zoom);
view_menu->addSeparator(); view_menu->addSeparator();
@ -322,7 +322,7 @@ BrowserWindow::BrowserWindow(Browser::CookieJar& cookie_jar, StringView webdrive
QObject::connect(m_tabs_container, &QTabWidget::currentChanged, [this](int index) { QObject::connect(m_tabs_container, &QTabWidget::currentChanged, [this](int index) {
setWindowTitle(QString("%1 - Ladybird").arg(m_tabs_container->tabText(index))); setWindowTitle(QString("%1 - Ladybird").arg(m_tabs_container->tabText(index)));
setWindowIcon(m_tabs_container->tabIcon(index)); setWindowIcon(m_tabs_container->tabIcon(index));
m_current_tab = verify_cast<Tab>(m_tabs_container->widget(index)); set_current_tab(verify_cast<Tab>(m_tabs_container->widget(index)));
}); });
QObject::connect(m_tabs_container, &QTabWidget::tabCloseRequested, this, &BrowserWindow::close_tab); QObject::connect(m_tabs_container, &QTabWidget::tabCloseRequested, this, &BrowserWindow::close_tab);
QObject::connect(close_current_tab_action, &QAction::triggered, this, &BrowserWindow::close_current_tab); QObject::connect(close_current_tab_action, &QAction::triggered, this, &BrowserWindow::close_current_tab);
@ -332,6 +332,12 @@ BrowserWindow::BrowserWindow(Browser::CookieJar& cookie_jar, StringView webdrive
setCentralWidget(m_tabs_container); setCentralWidget(m_tabs_container);
} }
void BrowserWindow::set_current_tab(Tab* tab)
{
m_current_tab = tab;
update_zoom_menu_text();
}
void BrowserWindow::debug_request(DeprecatedString const& request, DeprecatedString const& argument) void BrowserWindow::debug_request(DeprecatedString const& request, DeprecatedString const& argument)
{ {
if (!m_current_tab) if (!m_current_tab)
@ -346,7 +352,7 @@ Tab& BrowserWindow::new_tab(QString const& url, Web::HTML::ActivateTab activate_
m_tabs.append(std::move(tab)); m_tabs.append(std::move(tab));
if (m_current_tab == nullptr) { if (m_current_tab == nullptr) {
m_current_tab = tab_ptr; set_current_tab(tab_ptr);
} }
m_tabs_container->addTab(tab_ptr, "New Tab"); m_tabs_container->addTab(tab_ptr, "New Tab");
@ -513,20 +519,26 @@ void BrowserWindow::enable_dark_color_scheme()
void BrowserWindow::zoom_in() void BrowserWindow::zoom_in()
{ {
if (m_current_tab) if (!m_current_tab)
m_current_tab->view().zoom_in(); return;
m_current_tab->view().zoom_in();
update_zoom_menu_text();
} }
void BrowserWindow::zoom_out() void BrowserWindow::zoom_out()
{ {
if (m_current_tab) if (!m_current_tab)
m_current_tab->view().zoom_out(); return;
m_current_tab->view().zoom_out();
update_zoom_menu_text();
} }
void BrowserWindow::reset_zoom() void BrowserWindow::reset_zoom()
{ {
if (m_current_tab) if (!m_current_tab)
m_current_tab->view().reset_zoom(); return;
m_current_tab->view().reset_zoom();
update_zoom_menu_text();
} }
void BrowserWindow::select_all() void BrowserWindow::select_all()
@ -535,6 +547,13 @@ void BrowserWindow::select_all()
tab->view().select_all(); tab->view().select_all();
} }
void BrowserWindow::update_zoom_menu_text()
{
VERIFY(m_zoom_menu && m_current_tab);
auto zoom_level_text = MUST(String::formatted("&Zoom ({}%)", round_to<int>(m_current_tab->view().zoom_level() * 100)));
m_zoom_menu->setTitle(qstring_from_ak_string(zoom_level_text));
}
void BrowserWindow::copy_selected_text() void BrowserWindow::copy_selected_text()
{ {
if (auto* tab = m_current_tab) { if (auto* tab = m_current_tab) {

4
Ladybird/BrowserWindow.h
View file

@ -59,9 +59,13 @@ private:
void debug_request(DeprecatedString const& request, DeprecatedString const& argument = ""); void debug_request(DeprecatedString const& request, DeprecatedString const& argument = "");
void set_current_tab(Tab* tab);
void update_zoom_menu_text();
QTabWidget* m_tabs_container { nullptr }; QTabWidget* m_tabs_container { nullptr };
Vector<NonnullOwnPtr<Tab>> m_tabs; Vector<NonnullOwnPtr<Tab>> m_tabs;
Tab* m_current_tab { nullptr }; Tab* m_current_tab { nullptr };
QMenu* m_zoom_menu { nullptr };
Browser::CookieJar& m_cookie_jar; Browser::CookieJar& m_cookie_jar;