From bfa197b8892e14c95e063b5d14d949fa3265d031 Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 4 Apr 2021 21:40:36 +0000 Subject: [PATCH] .reference git-svn-id: svn://ultimatepp.org/upp/trunk@15895 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- reference/Pen/main.cpp | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/reference/Pen/main.cpp b/reference/Pen/main.cpp index 6fbfda19b..fa75d022d 100644 --- a/reference/Pen/main.cpp +++ b/reference/Pen/main.cpp @@ -9,28 +9,22 @@ struct MyApp : TopWindow { PenInfo pen; - virtual void MouseMove(Point p, dword keyflags) override { - if(keyflags & K_PEN) { - PenInfo pn = GetPenInfo(); - if(pn.pressure) { - if((!!pn.pressure == !!pen.pressure) && drawing.GetCount()) - drawing.Top().Add(MakeTuple(pn.pressure, p)); - else - drawing.Add().Add(MakeTuple(pn.pressure, p)); - } - pen = pn; - } - Refresh(); - } - - void LeftDown(Point p, dword keyflags) override { + virtual void Pen(Point p, const PenInfo& pn, dword keyflags) override { if(keyflags & K_SHIFT) { RectTracker tracker(*this); tracker.MinSize(Size(-100000,-100000)); tracker.Track(Rect(p,p)); } + if(pn.pressure) { + if((!!pn.pressure == !!pen.pressure) && drawing.GetCount()) + drawing.Top().Add(MakeTuple(pn.pressure, p)); + else + drawing.Add().Add(MakeTuple(pn.pressure, p)); + } + pen = pn; + Refresh(); } - + virtual void Paint(Draw& w0) override { DrawPainter w(w0, GetSize()); w.Co();