mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-11 00:56:33 +01:00
second part of: fix up scrolling of pixfaders by making them grab keyboard magic focus when the mouse pointer is within them
git-svn-id: svn://localhost/ardour2/branches/3.0@6345 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
a3bcba2357
commit
29a8238e4d
2 changed files with 8 additions and 0 deletions
|
|
@ -3956,6 +3956,10 @@ Editor::transport_punch_location()
|
||||||
bool
|
bool
|
||||||
Editor::control_layout_scroll (GdkEventScroll* ev)
|
Editor::control_layout_scroll (GdkEventScroll* ev)
|
||||||
{
|
{
|
||||||
|
if (Keyboard::some_magic_widget_has_focus()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (ev->direction) {
|
switch (ev->direction) {
|
||||||
case GDK_SCROLL_UP:
|
case GDK_SCROLL_UP:
|
||||||
scroll_tracks_up_line ();
|
scroll_tracks_up_line ();
|
||||||
|
|
|
||||||
|
|
@ -291,6 +291,10 @@ TimeAxisView::clip_to_viewport ()
|
||||||
bool
|
bool
|
||||||
TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
|
TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
|
||||||
{
|
{
|
||||||
|
if (Keyboard::some_magic_widget_has_focus()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
switch (ev->direction) {
|
switch (ev->direction) {
|
||||||
case GDK_SCROLL_UP:
|
case GDK_SCROLL_UP:
|
||||||
if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
|
if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue