enrico
/
stiletto
1
1
Fork 0
Code Issues 27 Pull Requests 3 Releases Wiki Activity

canvas-element-enum #3

Merged
enrico merged 11 commits from canvas-element-enum into master 2020-11-08 15:44:20 +01:00
Conversation 0 Commits 11 Files Changed 8 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8d335c6938 - Show all commits

5
src/main.rs
View File

@ -99,9 +99,10 @@ struct CanvasData {
impl Widget<CanvasData> for CanvasWidget { impl Widget<CanvasData> for CanvasWidget {
fn event<'a>(&mut self, _ctx: &mut EventCtx, event: &Event, data: &'a mut CanvasData, _env: &Env) { fn event<'a>(&mut self, _ctx: &mut EventCtx, event: &Event, data: &'a mut CanvasData, _env: &Env) {
match event { match event {
Event::MouseDown(mouse_event) => { Event::MouseDown(mouse_event) => {
if mouse_event.pointer_type == druid::PointerType::Stylus { if true /*&& mouse_event.pointer_type == druid::PointerType::Stylus || mouse_event.pointer_type == druid::PointerType::Mouse*/ {
data.is_drawing = true; data.is_drawing = true;
let mut kurbo_path = BezPath::new(); let mut kurbo_path = BezPath::new();
kurbo_path.move_to((mouse_event.pos.x, mouse_event.pos.y)); kurbo_path.move_to((mouse_event.pos.x, mouse_event.pos.y));
@ -110,7 +111,7 @@ impl Widget<CanvasData> for CanvasWidget {
} }
}, },
Event::MouseMove(mouse_event) => { Event::MouseMove(mouse_event) => {
if data.is_drawing && mouse_event.pointer_type == druid::PointerType::Stylus { if data.is_drawing /*&& (mouse_event.pointer_type == druid::PointerType::Stylus || mouse_event.pointer_type == druid::PointerType::Mouse)*/ {
let ptr: &'a mut dyn stiletto::CanvasElement = Rc::get_mut(data.elements.back_mut().unwrap()).unwrap(); let ptr: &'a mut dyn stiletto::CanvasElement = Rc::get_mut(data.elements.back_mut().unwrap()).unwrap();
let last_canvas_path: &'a mut stiletto::CanvasPath = ptr.get_path().unwrap(); let last_canvas_path: &'a mut stiletto::CanvasPath = ptr.get_path().unwrap();