Merge pull request #2302 from iced-rs/fix/themer-text-color

Use `application::StyleSheet` colors in `Themer`

widget/src/helpers.rs

@@ -15,6 +15,7 @@ use crate::rule::{self, Rule};
 use crate::runtime::Command;
 use crate::scrollable::{self, Scrollable};
 use crate::slider::{self, Slider};
+use crate::style::application;
 use crate::text::{self, Text};
 use crate::text_editor::{self, TextEditor};
 use crate::text_input::{self, TextInput};
@@ -445,6 +446,7 @@ pub fn themer<'a, Message, Theme, Renderer>(
 ) -> Themer<'a, Message, Theme, Renderer>
 where
     Renderer: core::Renderer,
+    Theme: application::StyleSheet,
 {
     Themer::new(theme, content)
 }

widget/src/themer.rs

@@ -1,3 +1,4 @@
+use crate::container;
 use crate::core::event::{self, Event};
 use crate::core::layout;
 use crate::core::mouse;
@@ -6,9 +7,10 @@ use crate::core::renderer;
 use crate::core::widget::tree::{self, Tree};
 use crate::core::widget::Operation;
 use crate::core::{
-    Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Size, Vector,
-    Widget,
+    Background, Clipboard, Element, Layout, Length, Point, Rectangle, Shell,
+    Size, Vector, Widget,
 };
+use crate::style::application;
 
 /// A widget that applies any `Theme` to its contents.
 ///
@@ -18,14 +20,18 @@ use crate::core::{
 pub struct Themer<'a, Message, Theme, Renderer>
 where
     Renderer: crate::core::Renderer,
+    Theme: application::StyleSheet,
 {
     content: Element<'a, Message, Theme, Renderer>,
     theme: Theme,
+    style: Theme::Style,
+    show_background: bool,
 }
 
 impl<'a, Message, Theme, Renderer> Themer<'a, Message, Theme, Renderer>
 where
     Renderer: crate::core::Renderer,
+    Theme: application::StyleSheet,
 {
     /// Creates an empty [`Themer`] that applies the given `Theme`
     /// to the provided `content`.
@@ -34,16 +40,25 @@ where
         T: Into<Element<'a, Message, Theme, Renderer>>,
     {
         Self {
-            theme,
             content: content.into(),
+            theme,
+            style: Theme::Style::default(),
+            show_background: false,
         }
     }
+
+    /// Sets whether to draw the background color of the `Theme`.
+    pub fn background(mut self, background: bool) -> Self {
+        self.show_background = background;
+        self
+    }
 }
 
 impl<'a, AnyTheme, Message, Theme, Renderer> Widget<Message, AnyTheme, Renderer>
     for Themer<'a, Message, Theme, Renderer>
 where
     Renderer: crate::core::Renderer,
+    Theme: application::StyleSheet,
 {
     fn tag(&self) -> tree::Tag {
         self.content.as_widget().tag()
@@ -120,16 +135,33 @@ where
         tree: &Tree,
         renderer: &mut Renderer,
         _theme: &AnyTheme,
-        renderer_style: &renderer::Style,
+        _style: &renderer::Style,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
         viewport: &Rectangle,
     ) {
+        let appearance = self.theme.appearance(&self.style);
+
+        if self.show_background {
+            container::draw_background(
+                renderer,
+                &container::Appearance {
+                    background: Some(Background::Color(
+                        appearance.background_color,
+                    )),
+                    ..container::Appearance::default()
+                },
+                layout.bounds(),
+            );
+        }
+
         self.content.as_widget().draw(
             tree,
             renderer,
             &self.theme,
-            renderer_style,
+            &renderer::Style {
+                text_color: appearance.text_color,
+            },
             layout,
             cursor,
             viewport,
@@ -248,7 +280,7 @@ impl<'a, AnyTheme, Message, Theme, Renderer>
     for Element<'a, Message, AnyTheme, Renderer>
 where
     Message: 'a,
-    Theme: 'a,
+    Theme: 'a + application::StyleSheet,
     Renderer: 'a + crate::core::Renderer,
 {
     fn from(