diff options
| author | corvid <corvid@lavabit.com> | 2012-12-28 18:37:30 +0000 |
|---|---|---|
| committer | corvid <corvid@lavabit.com> | 2012-12-28 18:37:30 +0000 |
| commit | c040d34e35210b091f76d7cdda8ff9a15e0a7bf9 (patch) | |
| tree | ce100806d913ddaf22b61f166f6149ed86d700fd | |
| parent | b202e5d66378396cf325336e44bc0e28304bf6da (diff) | |
move that change to viewport
| -rw-r--r-- | dw/fltkviewbase.cc | 9 | ||||
| -rw-r--r-- | dw/fltkviewport.cc | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc index c3aa6007..30a19d58 100644 --- a/dw/fltkviewbase.cc +++ b/dw/fltkviewbase.cc @@ -367,13 +367,8 @@ int FltkViewBase::handle (int event) focused_child = fl_oldfocus; return 0; case FL_KEYBOARD: - if (Fl::event_key() == FL_Tab) { - if (Fl::event_ctrl()) { - // the UI will handle it - return 0; - } else - return manageTabToFocus(); - } + if (Fl::event_key() == FL_Tab) + return manageTabToFocus(); break; default: break; diff --git a/dw/fltkviewport.cc b/dw/fltkviewport.cc index 5a58565e..c173ad50 100644 --- a/dw/fltkviewport.cc +++ b/dw/fltkviewport.cc @@ -238,9 +238,9 @@ int FltkViewport::handle (int event) * sends the event here. Returning zero tells FLTK to resend the * event as SHORTCUT, which we finally route to the parent. */ - /* As we don't know the exact keybindings set by the user, we ask - * for all of them (except Tab to keep form navigation). */ - if (Fl::event_key() != FL_Tab) + /* As we don't know the exact keybindings set by the user, we ask for + * all of them (except for the minimum needed to keep form navigation).*/ + if (Fl::event_key() != FL_Tab || Fl::event_ctrl()) return 0; break; |