From 89d50c0243fcb70442c78bbff207d0328b33e158 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 31 Oct 2021 17:04:44 +0700 Subject: Reintroduce `Box` for `style_sheet` in `PaneGrid` --- native/src/widget/pane_grid.rs | 6 +++--- style/src/pane_grid.rs | 13 +++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/native/src/widget/pane_grid.rs b/native/src/widget/pane_grid.rs index 22c18c05..48243c0b 100644 --- a/native/src/widget/pane_grid.rs +++ b/native/src/widget/pane_grid.rs @@ -99,7 +99,7 @@ pub struct PaneGrid<'a, Message, Renderer> { on_click: Option Message + 'a>>, on_drag: Option Message + 'a>>, on_resize: Option<(u16, Box Message + 'a>)>, - style_sheet: &'a dyn StyleSheet, + style_sheet: Box, } impl<'a, Message, Renderer> PaneGrid<'a, Message, Renderer> @@ -191,8 +191,8 @@ where } /// Sets the style of the [`PaneGrid`]. - pub fn style(mut self, style: &'a dyn StyleSheet) -> Self { - self.style_sheet = style; + pub fn style(mut self, style: impl Into>) -> Self { + self.style_sheet = style.into(); self } } diff --git a/style/src/pane_grid.rs b/style/src/pane_grid.rs index 032fcb6d..89cf39ea 100644 --- a/style/src/pane_grid.rs +++ b/style/src/pane_grid.rs @@ -35,8 +35,17 @@ impl StyleSheet for Default { } } -impl std::default::Default for &'static dyn StyleSheet { +impl std::default::Default for Box { fn default() -> Self { - &Default + Box::new(Default) + } +} + +impl<'a, T> From for Box +where + T: StyleSheet + 'a, +{ + fn from(style_sheet: T) -> Self { + Box::new(style_sheet) } } -- cgit