Compare commits
2 Commits
028c80b2b0
...
8d335c6938
| Author | SHA1 | Date |
|---|---|---|
|
|
8d335c6938 | |
|
|
95c83db203 |
|
|
@ -17,12 +17,12 @@ im = { version = "*" }
|
||||||
|
|
||||||
[dependencies.gtk]
|
[dependencies.gtk]
|
||||||
version = "0.9.2"
|
version = "0.9.2"
|
||||||
features = ["v3_24"]
|
features = ["v3_22"]
|
||||||
|
|
||||||
[dependencies.gio]
|
[dependencies.gio]
|
||||||
version = ""
|
version = ""
|
||||||
features = ["v2_60"]
|
features = ["v2_56"]
|
||||||
|
|
||||||
[dependencies.gdk]
|
[dependencies.gdk]
|
||||||
version = ""
|
version = ""
|
||||||
features = ["v3_24"]
|
features = ["v3_22"]
|
||||||
|
|
|
||||||
|
|
@ -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();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue