AModule::getScrollDir: move dir inside the only scope it is relevant

This commit is contained in:
Patrick Hilhorst 2019-06-17 20:09:53 +02:00
parent 71a9a75aad
commit 2c038d1977
No known key found for this signature in database
GPG Key ID: 589BB0A8DAFEF2B2

View File

@ -53,16 +53,16 @@ bool AModule::handleToggle(GdkEventButton* const& e) {
} }
AModule::SCROLL_DIR AModule::getScrollDir(GdkEventScroll* e) { AModule::SCROLL_DIR AModule::getScrollDir(GdkEventScroll* e) {
SCROLL_DIR dir{SCROLL_DIR::NONE};
if (e->direction == GDK_SCROLL_UP) { if (e->direction == GDK_SCROLL_UP) {
dir = SCROLL_DIR::UP; return SCROLL_DIR::UP;
} else if (e->direction == GDK_SCROLL_DOWN) { } else if (e->direction == GDK_SCROLL_DOWN) {
dir = SCROLL_DIR::DOWN; return SCROLL_DIR::DOWN;
} else if (e->direction == GDK_SCROLL_LEFT) { } else if (e->direction == GDK_SCROLL_LEFT) {
dir = SCROLL_DIR::LEFT; return SCROLL_DIR::LEFT;
} else if (e->direction == GDK_SCROLL_RIGHT) { } else if (e->direction == GDK_SCROLL_RIGHT) {
dir = SCROLL_DIR::RIGHT; return SCROLL_DIR::RIGHT;
} else if (e->direction == GDK_SCROLL_SMOOTH) { } else if (e->direction == GDK_SCROLL_SMOOTH) {
SCROLL_DIR dir{SCROLL_DIR::NONE};
gdouble delta_x, delta_y; gdouble delta_x, delta_y;
gdk_event_get_scroll_deltas(reinterpret_cast<const GdkEvent*>(e), &delta_x, &delta_y); gdk_event_get_scroll_deltas(reinterpret_cast<const GdkEvent*>(e), &delta_x, &delta_y);
distance_scrolled_y_ += delta_y; distance_scrolled_y_ += delta_y;
@ -88,8 +88,8 @@ AModule::SCROLL_DIR AModule::getScrollDir(GdkEventScroll* e) {
} else if (dir == SCROLL_DIR::LEFT || dir == SCROLL_DIR::RIGHT) { } else if (dir == SCROLL_DIR::LEFT || dir == SCROLL_DIR::RIGHT) {
distance_scrolled_x_ = 0; distance_scrolled_x_ = 0;
} }
return dir;
} }
return dir;
} }
bool AModule::handleScroll(GdkEventScroll* e) { bool AModule::handleScroll(GdkEventScroll* e) {