allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Simplify the logic of on_scroll_event

Browse Source
This commit is contained in:
Julien "_FrnchFrgg_" RIVAUD
2017-09-24 21:37:19 +02:00
parent 564fcb2132
commit 74c986534b
1 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
libs/widgets/ardour_fader.cc
View File

@@ -491,8 +491,6 @@ bool
ArdourFader::on_scroll_event (GdkEventScroll* ev) ArdourFader::on_scroll_event (GdkEventScroll* ev)
{ {
double increment = 0; double increment = 0;
bool ret = false;
if (ev->state & Keyboard::GainFineScaleModifier) { if (ev->state & Keyboard::GainFineScaleModifier) {
if (ev->state & Keyboard::GainExtraFineScaleModifier) { if (ev->state & Keyboard::GainExtraFineScaleModifier) {
increment = 0.05 * _adjustment.get_step_increment(); increment = 0.05 * _adjustment.get_step_increment();
@@ -503,41 +501,34 @@ ArdourFader::on_scroll_event (GdkEventScroll* ev)
increment = _adjustment.get_page_increment(); increment = _adjustment.get_page_increment();
} }
if (_orien == VERT) { bool vertical = false;
switch (ev->direction) { switch (ev->direction) {
case GDK_SCROLL_UP: case GDK_SCROLL_UP:
_adjustment.set_value (_adjustment.get_value() + increment); case GDK_SCROLL_DOWN:
ret = true; vertical = !(ev->state & Keyboard::ScrollHorizontalModifier);
break; break;
case GDK_SCROLL_DOWN: default:
_adjustment.set_value (_adjustment.get_value() - increment); break;
ret = true;
break;
default:
break;
}
} else {
int dir = ev->direction;
if (ev->state & Keyboard::ScrollHorizontalModifier || !(_tweaks & NoVerticalScroll)) {
if (ev->direction == GDK_SCROLL_UP) dir = GDK_SCROLL_RIGHT;
if (ev->direction == GDK_SCROLL_DOWN) dir = GDK_SCROLL_LEFT;
}
switch (dir) {
case GDK_SCROLL_RIGHT:
_adjustment.set_value (_adjustment.get_value() + increment);
ret = true;
break;
case GDK_SCROLL_LEFT:
_adjustment.set_value (_adjustment.get_value() - increment);
ret = true;
break;
default:
break;
}
} }
return ret; if ((_orien == VERT && !vertical) ||
((_tweaks & NoVerticalScroll) && vertical)) {
return false;
}
switch (ev->direction) {
case GDK_SCROLL_UP:
case GDK_SCROLL_RIGHT:
_adjustment.set_value (_adjustment.get_value() + increment);
break;
case GDK_SCROLL_DOWN:
case GDK_SCROLL_LEFT:
_adjustment.set_value (_adjustment.get_value() - increment);
break;
default:
return false;
}
return true;
} }
bool bool