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/Qt: Apply selected color scheme for new tabs

Browse source 
Previously, new tabs always had the `auto` color scheme, regardless of
what the user has selected before.
Replace the 3 individual slots with a `set_preferred_color_scheme`
method.
This commit is contained in:
simonkrauter 2024-07-06 15:19:09 -03:00 committed by Tim Ledbetter
parent 172e080b07
commit 82915e1914
Notes: sideshowbarker 2024-07-17 01:10:58 +09:00 
Author: https://github.com/simonkrauter
Commit: https://github.com/LadybirdBrowser/ladybird/commit/82915e1914
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/462
Reviewed-by: https://github.com/tcl3 ✅
2 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
Ladybird/Qt/BrowserWindow.cpp
View file

@ -239,19 +239,24 @@ BrowserWindow::BrowserWindow(Vector<URL::URL> const& initial_urls, WebView::Cook
auto_color_scheme->setCheckable(true);
color_scheme_group->addAction(auto_color_scheme);
color_scheme_menu->addAction(auto_color_scheme);
QObject::connect(auto_color_scheme, &QAction::triggered, this, &BrowserWindow::enable_auto_color_scheme);
QObject::connect(auto_color_scheme, &QAction::triggered, this, [this] {
set_preferred_color_scheme(Web::CSS::PreferredColorScheme::Auto);
});
auto* light_color_scheme = new QAction("&Light", this);
light_color_scheme->setCheckable(true);
color_scheme_group->addAction(light_color_scheme);
color_scheme_menu->addAction(light_color_scheme);
QObject::connect(light_color_scheme, &QAction::triggered, this, &BrowserWindow::enable_light_color_scheme);
QObject::connect(light_color_scheme, &QAction::triggered, this, [this] {
set_preferred_color_scheme(Web::CSS::PreferredColorScheme::Light);
});
auto* dark_color_scheme = new QAction("&Dark", this);
dark_color_scheme->setCheckable(true);
color_scheme_group->addAction(dark_color_scheme);
color_scheme_menu->addAction(dark_color_scheme);
QObject::connect(dark_color_scheme, &QAction::triggered, this, &BrowserWindow::enable_dark_color_scheme);
QObject::connect(dark_color_scheme, &QAction::triggered, this, [this] {
set_preferred_color_scheme(Web::CSS::PreferredColorScheme::Dark);
});
auto_color_scheme->setChecked(true);
@ -808,6 +813,7 @@ void BrowserWindow::initialize_tab(Tab* tab)
tab->set_user_agent_string(user_agent_string());
tab->set_navigator_compatibility_mode(navigator_compatibility_mode());
tab->set_enable_do_not_track(Settings::the()->enable_do_not_track());
tab->view().set_preferred_color_scheme(m_preferred_color_scheme);
}
void BrowserWindow::activate_tab(int index)
@ -982,27 +988,6 @@ void BrowserWindow::open_previous_tab()
m_tabs_container->setCurrentIndex(next_index);
}
void BrowserWindow::enable_auto_color_scheme()
{
for_each_tab([](auto& tab) {
tab.view().set_preferred_color_scheme(Web::CSS::PreferredColorScheme::Auto);
});
}
void BrowserWindow::enable_light_color_scheme()
{
for_each_tab([](auto& tab) {
tab.view().set_preferred_color_scheme(Web::CSS::PreferredColorScheme::Light);
});
}
void BrowserWindow::enable_dark_color_scheme()
{
for_each_tab([](auto& tab) {
tab.view().set_preferred_color_scheme(Web::CSS::PreferredColorScheme::Dark);
});
}
void BrowserWindow::enable_auto_contrast()
{
for_each_tab([](auto& tab) {
@ -1127,6 +1112,14 @@ void BrowserWindow::set_window_rect(Optional<Web::DevicePixels> x, Optional<Web:
setGeometry(x.value().value(), y.value().value(), width.value().value(), height.value().value());
}
void BrowserWindow::set_preferred_color_scheme(Web::CSS::PreferredColorScheme color_scheme)
{
m_preferred_color_scheme = color_scheme;
for_each_tab([color_scheme](auto& tab) {
tab.view().set_preferred_color_scheme(color_scheme);
});
}
void BrowserWindow::copy_selected_text()
{
if (!m_current_tab)

6
Ladybird/Qt/BrowserWindow.h
View file

@ -117,9 +117,6 @@ public slots:
void open_next_tab();
void open_previous_tab();
void open_file();
void enable_auto_color_scheme();
void enable_light_color_scheme();
void enable_dark_color_scheme();
void enable_auto_contrast();
void enable_less_contrast();
void enable_more_contrast();
@ -179,6 +176,9 @@ private:
QScreen* m_current_screen;
double m_device_pixel_ratio { 0 };
Web::CSS::PreferredColorScheme m_preferred_color_scheme;
void set_preferred_color_scheme(Web::CSS::PreferredColorScheme color_scheme);
QTabWidget* m_tabs_container { nullptr };
Tab* m_current_tab { nullptr };
QMenu* m_zoom_menu { nullptr };