From 3140cdc4babcefc444f1c1d30eb0f5f4ed1df054 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 18 Oct 2021 16:02:30 +0700 Subject: Wire up styling to `Button` in `iced_native` --- style/src/button.rs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'style/src/button.rs') diff --git a/style/src/button.rs b/style/src/button.rs index 2281e32f..608f344b 100644 --- a/style/src/button.rs +++ b/style/src/button.rs @@ -80,17 +80,8 @@ impl StyleSheet for Default { } } -impl std::default::Default for Box { +impl std::default::Default for &'static dyn StyleSheet { fn default() -> Self { - Box::new(Default) - } -} - -impl From for Box -where - T: 'static + StyleSheet, -{ - fn from(style: T) -> Self { - Box::new(style) + &Default } } -- cgit From d36ce33a95c277ee8fe45555df17daf21ef02ef8 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sun, 31 Oct 2021 16:53:18 +0700 Subject: Reintroduce `Box` for `style_sheet` in `Button` --- style/src/button.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'style/src/button.rs') diff --git a/style/src/button.rs b/style/src/button.rs index 608f344b..ff4f61c3 100644 --- a/style/src/button.rs +++ b/style/src/button.rs @@ -80,8 +80,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 From 157a40a56882ec1959034fa499b383e7f633aaf8 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 2 Nov 2021 16:02:05 +0700 Subject: Introduce generic lifetime to `Default` implementation for style sheets --- style/src/button.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'style/src/button.rs') diff --git a/style/src/button.rs b/style/src/button.rs index ff4f61c3..de2de4f4 100644 --- a/style/src/button.rs +++ b/style/src/button.rs @@ -80,7 +80,7 @@ impl StyleSheet for Default { } } -impl std::default::Default for Box { +impl<'a> std::default::Default for Box { fn default() -> Self { Box::new(Default) } -- cgit