From 97555e67af8b4bcc77df69c5e72156e14948150e Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 7 Jun 2022 04:11:24 +0200 Subject: Implement theme styling for `Container` --- native/src/overlay/menu.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'native/src/overlay') diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs index 36dc8f03..fdb68247 100644 --- a/native/src/overlay/menu.rs +++ b/native/src/overlay/menu.rs @@ -7,8 +7,8 @@ use crate::overlay; use crate::renderer; use crate::text::{self, Text}; use crate::touch; +use crate::widget::container::{self, Container}; use crate::widget::scrollable::{self, Scrollable}; -use crate::widget::Container; use crate::{ Clipboard, Color, Element, Layout, Length, Padding, Point, Rectangle, Shell, Size, Vector, Widget, @@ -34,7 +34,7 @@ impl<'a, T, Renderer> Menu<'a, T, Renderer> where T: ToString + Clone, Renderer: text::Renderer + 'a, - Renderer::Theme: scrollable::StyleSheet, + Renderer::Theme: container::StyleSheet + scrollable::StyleSheet, { /// Creates a new [`Menu`] with the given [`State`], a list of options, and /// the message to produced when an option is selected. @@ -118,7 +118,11 @@ impl State { } } -struct Overlay<'a, Message, Renderer> { +struct Overlay<'a, Message, Renderer> +where + Renderer: crate::Renderer, + Renderer::Theme: container::StyleSheet, +{ container: Container<'a, Message, Renderer>, width: u16, target_height: f32, @@ -130,7 +134,7 @@ where Message: 'a, Renderer: 'a, Renderer: text::Renderer, - Renderer::Theme: scrollable::StyleSheet, + Renderer::Theme: container::StyleSheet + scrollable::StyleSheet, { pub fn new(menu: Menu<'a, T, Renderer>, target_height: f32) -> Self where @@ -173,6 +177,7 @@ impl<'a, Message, Renderer> crate::Overlay for Overlay<'a, Message, Renderer> where Renderer: text::Renderer, + Renderer::Theme: container::StyleSheet, { fn layout( &self, -- cgit