From b64e858af397e51c1f1bad95a1747a54a85ab744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Nusser?= Date: Sun, 10 Jun 2018 13:53:06 +0200 Subject: Add instrument label and highlight of drums. --- plugingui/drumkittab.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'plugingui/drumkittab.h') diff --git a/plugingui/drumkittab.h b/plugingui/drumkittab.h index 89f37be..cd1d731 100644 --- a/plugingui/drumkittab.h +++ b/plugingui/drumkittab.h @@ -55,12 +55,16 @@ public: void resize(std::size_t width, std::size_t height) override; void buttonEvent(ButtonEvent* buttonEvent) override; void scrollEvent(ScrollEvent* scrollEvent) override; + void mouseLeaveEvent() override; void loadImageFiles(std::string const& image_file, std::string const& map_file); private: - float current_velocity = .5; + float current_velocity{.5}; + std::string current_instrument{""}; + std::unordered_map colour_to_instrument; + bool shows_overlay{false}; std::unique_ptr drumkit_image; std::unique_ptr map_image; @@ -68,6 +72,7 @@ private: int drumkit_image_y; Label velocity_label{this}; + Label instrument_name_label{this}; Settings& settings; // SettingsNotifier& settings_notifier; @@ -75,6 +80,7 @@ private: void triggerAudition(int x, int y); void updateVelocityLabel(); + void updateInstrumentLabel(); }; } // GUI:: -- cgit v1.2.3