From e2e4dc63bbe5abbcdb3179cd5072071d1fa5bfa0 Mon Sep 17 00:00:00 2001 From: Eduardo Flores Date: Sat, 15 Oct 2022 15:18:44 -0700 Subject: [PATCH] Replaced generic Renderer for iced::Renderer --- src/widget/navigation/navbar.rs | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/src/widget/navigation/navbar.rs b/src/widget/navigation/navbar.rs index 9f6a7111..e5e9b1c6 100644 --- a/src/widget/navigation/navbar.rs +++ b/src/widget/navigation/navbar.rs @@ -4,11 +4,12 @@ use crate::widget::Background; use derive_setters::Setters; use iced::Length; use iced_lazy::Component; -use iced_native::widget::{button, column, container, text}; +use iced_native::widget::{column, container}; use iced_native::{row, Alignment, Element}; use iced_style::button::Appearance; -use iced_style::{scrollable, theme, Theme}; +use iced_style::{theme, Theme}; use std::collections::BTreeMap; +use iced::Renderer; #[derive(Setters, Default)] pub struct NavBar<'a, Message> { @@ -68,15 +69,7 @@ pub struct NavBarState { selected_page: Option, } -impl<'a, Message, Renderer> Component for NavBar<'a, Message> -where - Renderer: iced_native::Renderer + iced_native::text::Renderer + iced_native::svg::Renderer + 'a, - ::Theme: - container::StyleSheet + button::StyleSheet + text::StyleSheet + scrollable::StyleSheet, - <::Theme as button::StyleSheet>::Style: From, - <::Theme as container::StyleSheet>::Style: - From, - <::Theme as text::StyleSheet>::Style: From, +impl<'a, Message> Component for NavBar<'a, Message> { type State = NavBarState; type Event = NavBarEvent; @@ -157,15 +150,7 @@ where } } -impl<'a, Message: 'a, Renderer> From> for Element<'a, Message, Renderer> -where - Renderer: iced_native::text::Renderer + iced_native::svg::Renderer + 'a, - ::Theme: - container::StyleSheet + button::StyleSheet + text::StyleSheet + scrollable::StyleSheet, - <::Theme as button::StyleSheet>::Style: From, - <::Theme as container::StyleSheet>::Style: - From, - <::Theme as text::StyleSheet>::Style: From, +impl<'a, Message: 'a> From> for Element<'a, Message, Renderer> { fn from(nav_bar: NavBar<'a, Message>) -> Self { iced_lazy::component(nav_bar)