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

Compare commits

base: enrico:8d335c6938e519588d6df3727a9b5ab3f5b37433
Branches Tags
enrico:master
enrico:pointer_events
enrico:scroll
enrico:rectangular_selection
enrico:migrate
enrico:tools_v2
enrico:tools
enrico:tools_enrico
enrico:eraserhead
enrico:save_load
enrico:canvas-element-enum
enrico:canvas-element-trait
enrico:v0.1
..
compare: enrico:028c80b2b01a4b69d04f8e74573542d4c2e0516a
Branches Tags
enrico:pointer_events
enrico:scroll
enrico:rectangular_selection
enrico:master
enrico:migrate
enrico:tools_v2
enrico:tools
enrico:tools_enrico
enrico:eraserhead
enrico:save_load
enrico:canvas-element-enum
enrico:canvas-element-trait
enrico:v0.1

No commits in common. "8d335c6938e519588d6df3727a9b5ab3f5b37433" and "028c80b2b01a4b69d04f8e74573542d4c2e0516a" have entirely different histories.
8d335c6938 ... 028c80b2b0

2 changed files with 5 additions and 6 deletions
Show Stats Expand all files Collapse all files

6
Cargo.toml
View File

@ -17,12 +17,12 @@ im = { version = "*" }
[dependencies.gtk] [dependencies.gtk]
version = "0.9.2" version = "0.9.2"
features = ["v3_22"] features = ["v3_24"]
[dependencies.gio] [dependencies.gio]
version = "" version = ""
features = ["v2_56"] features = ["v2_60"]
[dependencies.gdk] [dependencies.gdk]
version = "" version = ""
features = ["v3_22"] features = ["v3_24"]

5
src/main.rs
View File

@ -99,10 +99,9 @@ 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 true /*&& mouse_event.pointer_type == druid::PointerType::Stylus || mouse_event.pointer_type == druid::PointerType::Mouse*/ { if mouse_event.pointer_type == druid::PointerType::Stylus {
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));
@ -111,7 +110,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 || mouse_event.pointer_type == druid::PointerType::Mouse)*/ { if data.is_drawing && mouse_event.pointer_type == druid::PointerType::Stylus {
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();