From ccf6e828c570151b447449a10d759a4031a3c076 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 9 Apr 2020 16:43:46 +0200 Subject: WIP: Highlioghts and clicks re-enabled. --- plugingui/drumkitimage.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'plugingui/drumkitimage.h') diff --git a/plugingui/drumkitimage.h b/plugingui/drumkitimage.h index 2a9f27a..c92a1f6 100644 --- a/plugingui/drumkitimage.h +++ b/plugingui/drumkitimage.h @@ -59,20 +59,28 @@ private: public: Overlay(Widget* parent); - void setOverlay(const std::string& overlayfile); + void setOverlay(const Image& image); void clearOverlay(); + void setColour(const Colour& colour); // From Widget: void buttonEvent(ButtonEvent* buttonEvent) override; void mouseMoveEvent(MouseMoveEvent* mouseMoveEvent) override; + void resize(std::size_t width, std::size_t height) override; void repaintEvent(RepaintEvent* repaintEvent) override; private: - std::unique_ptr overlay; + const Image* overlay{nullptr}; + bool needs_repaint{true}; + Colour highlight_colour; + float scale{1.0f}; }; - Overlay overlay{this}; + Overlay hover_overlay{this}; + Overlay click_overlay{this}; std::unique_ptr image; + std::unique_ptr overlay; + float scale{1.0f}; }; } // GUI:: -- cgit v1.2.3