diff --git a/dpf b/dpf index 326178f..f187108 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 326178f2327c60c53357b8f88779e229bf435c75 +Subproject commit f187108634f98b0b7fb944dc9ab03c78ccd533e3 diff --git a/examples/demo.cpp b/examples/demo.cpp index cc12335..21c9242 100644 --- a/examples/demo.cpp +++ b/examples/demo.cpp @@ -106,11 +106,11 @@ protected: img4.drawAt(pad, pad + 3 + iconSize*3); } - bool onMouse(int button, bool press, int x, int y) override + bool onMouse(const MouseEvent& ev) override { - if (button != 1 || ! press) + if (ev.button != 1 || ! ev.press) return false; - if (! contains(x, y)) + if (! contains(ev.pos)) return false; const int iconSize = getWidth(); @@ -119,7 +119,7 @@ protected: { bgIcon.setY(i*iconSize + i + 1); - if (bgIcon.contains(x, y)) + if (bgIcon.contains(ev.pos)) { curPage = i; callback->curPageChanged(i); @@ -131,9 +131,9 @@ protected: return true; } - bool onMotion(int x, int y) override + bool onMotion(const MotionEvent& ev) override { - if (contains(x, y)) + if (contains(ev.pos)) { const int iconSize = getWidth(); @@ -141,7 +141,7 @@ protected: { bgIcon.setY(i*iconSize + i + 1); - if (bgIcon.contains(x, y)) + if (bgIcon.contains(ev.pos)) { if (curHover == i) return true; @@ -170,9 +170,12 @@ protected: } } - void onReshape(int width, int height) override + void onResize(const ResizeEvent& ev) override { - bg.setSize(width, height); + const int width = ev.size.getWidth(); + const int height = ev.size.getHeight(); + + bg.setSize(ev.size); bgIcon.setWidth(width-2); bgIcon.setHeight(width-2); @@ -189,6 +192,7 @@ private: Image img1, img2, img3, img4; }; +#if 0 // ------------------------------------------------------ // Resize handle @@ -256,8 +260,8 @@ protected: if (! press) return false; - fLastX = x+getX(); - fLastY = y+getY(); + fLastX = x+getAbsoluteX(); + fLastY = y+getAbsoluteY(); fMouseUnder = true; return true; } @@ -267,8 +271,8 @@ protected: if (! fMouseUnder) return false; - x += getX(); - y += getY(); + x += getAbsoluteX(); + y += getAbsoluteY(); const int movedX = x - fLastX; const int movedY = y - fLastY; @@ -291,6 +295,7 @@ protected: int fLastX, fLastY; Line fLine1, fLine2, fLine3; }; +#endif // ------------------------------------------------------ // Our Demo Window @@ -306,7 +311,7 @@ public: wRects(*this), wShapes(*this), wLeft(*this, this), - wRezHandle(*this), + //wRezHandle(*this), curWidget(nullptr) { wColor.hide(); @@ -314,11 +319,11 @@ public: wRects.hide(); wShapes.hide(); - wColor.setX(80); - wImages.setX(80); - wRects.setX(80); - wShapes.setX(80); - wLeft.setPos(2, 2); + wColor.setAbsoluteX(80); + wImages.setAbsoluteX(80); + wRects.setAbsoluteX(80); + wShapes.setAbsoluteX(80); + wLeft.setAbsolutePos(2, 2); setSize(600, 500); setTitle("DGL Demo"); @@ -335,8 +340,8 @@ public: wShapes.setSize(size); wLeft.setSize(73, height-4); - wRezHandle.setX(width-wRezHandle.getWidth()); - wRezHandle.setY(height-wRezHandle.getHeight()); + //wRezHandle.setAbsoluteX(width-wRezHandle.getWidth()); + //wRezHandle.setAbsoluteY(height-wRezHandle.getHeight()); Window::onReshape(width, height); } @@ -376,7 +381,7 @@ private: ExampleRectanglesWidget wRects; ExampleShapesWidget wShapes; LeftSideWidget wLeft; - ResizeHandle wRezHandle; + //ResizeHandle wRezHandle; Widget* curWidget; }; diff --git a/examples/widgets/ExampleColorWidget.hpp b/examples/widgets/ExampleColorWidget.hpp index 0a12e73..80f73e8 100644 --- a/examples/widgets/ExampleColorWidget.hpp +++ b/examples/widgets/ExampleColorWidget.hpp @@ -114,8 +114,11 @@ protected: bgSmall.draw(); } - void onReshape(int width, int height) override + void onResize(const ResizeEvent& ev) override { + const int width = ev.size.getWidth(); + const int height = ev.size.getHeight(); + // full bg bgFull = Rectangle(0, 0, width, height); diff --git a/examples/widgets/ExampleRectanglesWidget.hpp b/examples/widgets/ExampleRectanglesWidget.hpp index d92a5f4..ec3fa76 100644 --- a/examples/widgets/ExampleRectanglesWidget.hpp +++ b/examples/widgets/ExampleRectanglesWidget.hpp @@ -93,9 +93,9 @@ protected: } } - bool onMouse(int button, bool press, int x, int y) override + bool onMouse(const MouseEvent& ev) override { - if (button != 1 || ! press) + if (ev.button != 1 || ! ev.press) return false; const int width = getWidth(); @@ -114,7 +114,7 @@ protected: // 1st r.setY(3); - if (r.contains(x, y)) + if (r.contains(ev.pos)) { fClicked[0+i] = !fClicked[0+i]; repaint(); @@ -124,7 +124,7 @@ protected: // 2nd r.setY(3 + height/3); - if (r.contains(x, y)) + if (r.contains(ev.pos)) { fClicked[3+i] = !fClicked[3+i]; repaint(); @@ -134,7 +134,7 @@ protected: // 3rd r.setY(3 + height*2/3); - if (r.contains(x, y)) + if (r.contains(ev.pos)) { fClicked[6+i] = !fClicked[6+i]; repaint(); diff --git a/examples/widgets/ExampleShapesWidget.hpp b/examples/widgets/ExampleShapesWidget.hpp index a4975b8..ee0091a 100644 --- a/examples/widgets/ExampleShapesWidget.hpp +++ b/examples/widgets/ExampleShapesWidget.hpp @@ -81,8 +81,11 @@ protected: cir.drawOutline(); } - void onReshape(int width, int height) override + void onResize(const ResizeEvent& ev) override { + const int width = ev.size.getWidth(); + const int height = ev.size.getHeight(); + // background bg = Rectangle(0, 0, width, height);