From 2d961a6e9c757f906e15684b1e780faca7607bfe Mon Sep 17 00:00:00 2001 From: Enrico Lumetti Date: Sat, 21 Nov 2020 13:21:42 +0100 Subject: [PATCH] A ray of hope --- src/bin/canvas_tool_list.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/canvas_tool_list.rs b/src/bin/canvas_tool_list.rs index 803fa6f..2170486 100644 --- a/src/bin/canvas_tool_list.rs +++ b/src/bin/canvas_tool_list.rs @@ -18,7 +18,7 @@ use druid::im::{vector, Vector}; use druid::widget::prelude::*; -use druid::widget::{Align, Label, Button, CrossAxisAlignment, Flex, List, ListGrowDirection, WidgetExt, SizedBox}; +use druid::widget::{Align, Label, Button, CrossAxisAlignment, Flex, List, ListGrowDirection, WidgetExt, SizedBox, Either}; use druid::{AppLauncher, Color, Data, LocalizedString, WindowDesc, Lens, UnitPoint}; #[derive(Clone, Data)] @@ -29,7 +29,7 @@ enum CanvasToolState { trait CanvasToolBuilder { fn default_state() -> CanvasToolState; - fn build_widget(&self) -> Box>; + fn build_widget() -> Box>; } struct PenBuilder; @@ -41,7 +41,7 @@ impl CanvasToolBuilder for PenBuilder { thickness: 2.0 } } - fn build_widget(&self) -> Box> { + fn build_widget() -> Box> { Box::new(SizedBox::new( Label::new(|item: &CanvasToolState, _env: &_| format!("pen")) .align_horizontal(UnitPoint::CENTER) @@ -57,7 +57,7 @@ impl CanvasToolBuilder for EraserBuilder { fn default_state() -> CanvasToolState { CanvasToolState::Eraser {} } - fn build_widget(&self) -> Box> { + fn build_widget() -> Box> { Box::new(SizedBox::new( Label::new(|item: &CanvasToolState, _env: &_| format!("eraser")) .align_horizontal(UnitPoint::CENTER) @@ -89,7 +89,7 @@ fn build_ui() -> impl Widget { .cross_axis_alignment(CrossAxisAlignment::Center) .with_flex_child( List::new(|| { - //CanvasToolBuilder::build_widget ??? + PenBuilder::build_widget() }) .grow(ListGrowDirection::Right) .lens(AppState::tools)