From 966d808135c03d16b1be65df7ca028ae7813476d Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Thu, 12 Jan 2023 18:27:34 +0000 Subject: [PATCH] Ladybird: Replace ColorScheme enum with Web::CSS::PreferredColorScheme This matches OutOfProcessWebView::set_preferred_color_scheme(). --- Ladybird/BrowserWindow.cpp | 7 ++++--- Ladybird/WebContentView.cpp | 14 ++------------ Ladybird/WebContentView.h | 9 ++------- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/Ladybird/BrowserWindow.cpp b/Ladybird/BrowserWindow.cpp index 81e3689c5b..ee5ea9cbe0 100644 --- a/Ladybird/BrowserWindow.cpp +++ b/Ladybird/BrowserWindow.cpp @@ -14,6 +14,7 @@ #include "WebContentView.h" #include #include +#include #include #include #include @@ -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); } } diff --git a/Ladybird/WebContentView.cpp b/Ladybird/WebContentView.cpp index 5ff8f17704..f320f3cd02 100644 --- a/Ladybird/WebContentView.cpp +++ b/Ladybird/WebContentView.cpp @@ -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() diff --git a/Ladybird/WebContentView.h b/Ladybird/WebContentView.h index d7a1615a20..b33b1599b4 100644 --- a/Ladybird/WebContentView.h +++ b/Ladybird/WebContentView.h @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -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();