X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmainwindow.cpp;h=dfc2ea5b2ec5514158d4f11bad9d684574ed1342;hb=33b86069c755119da2a35af63fbd580ca9abfa7c;hp=9bea809b8c63dc2ebe0ac840e9900a313402cd09;hpb=f78363119d05e83b2665d89b147945fc0cdec020;p=nageru diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp index 9bea809..dfc2ea5 100644 --- a/futatabi/mainwindow.cpp +++ b/futatabi/mainwindow.cpp @@ -289,7 +289,7 @@ MainWindow::MainWindow() if (!load_midi_mapping_from_file(global_flags.midi_mapping_filename, &midi_mapping)) { fprintf(stderr, "Couldn't load MIDI mapping '%s'; exiting.\n", global_flags.midi_mapping_filename.c_str()); - exit(1); + abort(); } midi_mapper.set_midi_mapping(midi_mapping); } @@ -844,6 +844,11 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event) if (mouse->modifiers() & Qt::KeyboardModifier::ShiftModifier) { scrub_sensitivity *= 10; wheel_sensitivity *= 10; + if (mouse->modifiers() & Qt::KeyboardModifier::ControlModifier) { + // Ctrl+Shift is a super-modifier, meant only for things like “go back two hours”. + scrub_sensitivity *= 100; + wheel_sensitivity *= 100; + } } if (mouse->modifiers() & Qt::KeyboardModifier::AltModifier) { // Note: Shift + Alt cancel each other out. scrub_sensitivity /= 10; @@ -899,6 +904,11 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event) if (wheel->modifiers() & Qt::KeyboardModifier::ShiftModifier) { scrub_sensitivity *= 10; wheel_sensitivity *= 10; + if (wheel->modifiers() & Qt::KeyboardModifier::ControlModifier) { + // Ctrl+Shift is a super-modifier, meant only for things like “go back two hours”. + scrub_sensitivity *= 100; + wheel_sensitivity *= 100; + } } if (wheel->modifiers() & Qt::KeyboardModifier::AltModifier) { // Note: Shift + Alt cancel each other out. scrub_sensitivity /= 10;