RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-22 11:45:08 +00:00
Code Issues Activity Actions

Ladybird: Replace ColorScheme enum with Web::CSS::PreferredColorScheme

Browse source 
This matches OutOfProcessWebView::set_preferred_color_scheme().
This commit is contained in:
Linus Groh 2023-01-12 18:27:34 +00:00
parent 877be0eb43
commit 966d808135
3 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ladybird/BrowserWindow.cpp
View file

@ -14,6 +14,7 @@
#include "WebContentView.h"
#include <AK/TypeCasts.h>
#include <Browser/CookieJar.h>
#include <LibWeb/CSS/PreferredColorScheme.h>
#include <LibWeb/Loader/ResourceLoader.h>
#include <QAction>
#include <QActionGroup>
@ -419,21 +420,21 @@ void BrowserWindow::open_previous_tab()
void BrowserWindow::enable_auto_color_scheme()
{
for (auto& tab : m_tabs) {
tab.view().set_color_scheme(ColorScheme::Auto);
tab.view().set_preferred_color_scheme(Web::CSS::PreferredColorScheme::Auto);
}
}
void BrowserWindow::enable_light_color_scheme()
{
for (auto& tab : m_tabs) {
tab.view().set_color_scheme(ColorScheme::Light);
tab.view().set_preferred_color_scheme(Web::CSS::PreferredColorScheme::Light);
}
}
void BrowserWindow::enable_dark_color_scheme()
{
for (auto& tab : m_tabs) {
tab.view().set_color_scheme(ColorScheme::Dark);
tab.view().set_preferred_color_scheme(Web::CSS::PreferredColorScheme::Dark);
}
}

14
Ladybird/WebContentView.cpp
View file

@ -561,19 +561,9 @@ void WebContentView::show_inspector()
inspect_dom_tree();
}
void WebContentView::set_color_scheme(ColorScheme color_scheme)
void WebContentView::set_preferred_color_scheme(Web::CSS::PreferredColorScheme color_scheme)
{
switch (color_scheme) {
case ColorScheme::Auto:
client().async_set_preferred_color_scheme(Web::CSS::PreferredColorScheme::Auto);
break;
case ColorScheme::Light:
client().async_set_preferred_color_scheme(Web::CSS::PreferredColorScheme::Light);
break;
case ColorScheme::Dark:
client().async_set_preferred_color_scheme(Web::CSS::PreferredColorScheme::Dark);
break;
}
client().async_set_preferred_color_scheme(color_scheme);
}
void WebContentView::zoom_in()

9
Ladybird/WebContentView.h
View file

@ -17,6 +17,7 @@
#include <LibGfx/Forward.h>
#include <LibGfx/Rect.h>
#include <LibGfx/StandardCursor.h>
#include <LibWeb/CSS/PreferredColorScheme.h>
#include <LibWeb/CSS/Selector.h>
#include <LibWebView/ViewImplementation.h>
@ -40,12 +41,6 @@ class WebContentClient;
using WebView::WebContentClient;
enum class ColorScheme {
Auto,
Light,
Dark,
};
class Tab;
class WebContentView final
@ -111,7 +106,7 @@ public:
Gfx::IntPoint to_content(Gfx::IntPoint) const;
Gfx::IntPoint to_widget(Gfx::IntPoint) const;
void set_color_scheme(ColorScheme);
void set_preferred_color_scheme(Web::CSS::PreferredColorScheme);
void zoom_in();
void zoom_out();