Add handleRelease method to release events
This commit shouldn't change the handleToggle behaviour, it shouldn't break anything.pull/2414/head
parent
1d8331d0c5
commit
2ff347f9a8
|
@ -36,8 +36,11 @@ class AModule : public IModule {
|
||||||
|
|
||||||
virtual bool handleToggle(GdkEventButton *const &ev);
|
virtual bool handleToggle(GdkEventButton *const &ev);
|
||||||
virtual bool handleScroll(GdkEventScroll *);
|
virtual bool handleScroll(GdkEventScroll *);
|
||||||
|
virtual bool handleRelease(GdkEventButton *const &ev);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
bool handleUserEvent(GdkEventButton *const &ev);
|
||||||
|
|
||||||
std::vector<int> pid_;
|
std::vector<int> pid_;
|
||||||
gdouble distance_scrolled_y_;
|
gdouble distance_scrolled_y_;
|
||||||
gdouble distance_scrolled_x_;
|
gdouble distance_scrolled_x_;
|
||||||
|
|
|
@ -38,6 +38,16 @@ AModule::AModule(const Json::Value& config, const std::string& name, const std::
|
||||||
event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
|
event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
|
||||||
event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &AModule::handleToggle));
|
event_box_.signal_button_press_event().connect(sigc::mem_fun(*this, &AModule::handleToggle));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool hasReleaseEvent =
|
||||||
|
std::find_if(eventMap_.cbegin(), eventMap_.cend(), [&config](const auto& eventEntry) {
|
||||||
|
//True if there is any non-release type event
|
||||||
|
return eventEntry.first.second == GdkEventType::GDK_BUTTON_RELEASE && config[eventEntry.second].isString();
|
||||||
|
}) != eventMap_.cend();
|
||||||
|
if (hasReleaseEvent) {
|
||||||
|
event_box_.add_events(Gdk::BUTTON_RELEASE_MASK);
|
||||||
|
event_box_.signal_button_release_event().connect(sigc::mem_fun(*this, &AModule::handleRelease));
|
||||||
|
}
|
||||||
if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString() || enable_scroll) {
|
if (config_["on-scroll-up"].isString() || config_["on-scroll-down"].isString() || enable_scroll) {
|
||||||
event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
|
event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
|
||||||
event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &AModule::handleScroll));
|
event_box_.signal_scroll_event().connect(sigc::mem_fun(*this, &AModule::handleScroll));
|
||||||
|
@ -69,6 +79,14 @@ auto AModule::doAction(const std::string& name) -> void {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AModule::handleToggle(GdkEventButton* const& e) {
|
bool AModule::handleToggle(GdkEventButton* const& e) {
|
||||||
|
return handleUserEvent(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AModule::handleRelease(GdkEventButton* const& e) {
|
||||||
|
return handleUserEvent(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AModule::handleUserEvent(GdkEventButton* const& e) {
|
||||||
std::string format{};
|
std::string format{};
|
||||||
const std::map<std::pair<uint, GdkEventType>, std::string>::const_iterator& rec{
|
const std::map<std::pair<uint, GdkEventType>, std::string>::const_iterator& rec{
|
||||||
eventMap_.find(std::pair(e->button, e->type))};
|
eventMap_.find(std::pair(e->button, e->type))};
|
||||||
|
|
Loading…
Reference in New Issue