Forráskód Böngészése

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

This matches OutOfProcessWebView::set_preferred_color_scheme().
Linus Groh 2 éve
szülő
commit
966d808135
3 módosított fájl, 8 hozzáadás és 22 törlés
  1. 4 3
      Ladybird/BrowserWindow.cpp
  2. 2 12
      Ladybird/WebContentView.cpp
  3. 2 7
      Ladybird/WebContentView.h

+ 4 - 3
Ladybird/BrowserWindow.cpp

@@ -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);
     }
 }
 

+ 2 - 12
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()

+ 2 - 7
Ladybird/WebContentView.h

@@ -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();