mirror of
https://github.com/storytold/effectcraft.git
synced 2026-10-26 19:18:14 -06:00
Merge pull request #1158 from nanox333/fix/551-shift-space-every-frame
# Conflicts: # docs/ui-parity.md
This commit is contained in:
@@ -205,9 +205,8 @@ impl PreviewPreset {
|
||||
pub fn default_for(s: PreviewShortcut) -> Self {
|
||||
let d = PreviewPreset::default();
|
||||
match s {
|
||||
PreviewShortcut::Spacebar => d,
|
||||
// A lighter preview: every other frame.
|
||||
PreviewShortcut::ShiftSpacebar => PreviewPreset { skip: 1, ..d },
|
||||
// Frame skipping is off by default; set Skip to play fewer frames.
|
||||
PreviewShortcut::Spacebar | PreviewShortcut::ShiftSpacebar => d,
|
||||
PreviewShortcut::Numpad0 => PreviewPreset { range: PreviewRange::WorkArea, play_from: PlayFrom::RangeStart, ..d },
|
||||
PreviewShortcut::ShiftNumpad0 => {
|
||||
PreviewPreset { range: PreviewRange::WorkArea, play_from: PlayFrom::RangeStart, skip: 1, resolution: PreviewResolution::Half, ..d }
|
||||
@@ -509,6 +508,13 @@ mod tests {
|
||||
assert_eq!(pl.frame_after(237, 1), None);
|
||||
}
|
||||
|
||||
/// #551: Shift+Spacebar used to skip every other frame out of the box.
|
||||
#[test]
|
||||
fn shift_spacebar_plays_every_frame_by_default() {
|
||||
assert_eq!(PreviewPreset::default_for(PreviewShortcut::ShiftSpacebar).skip, 0);
|
||||
assert_eq!(PreviewPreset::default_for(PreviewShortcut::ShiftSpacebar), PreviewPreset::default_for(PreviewShortcut::Spacebar));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn settings_commands_round_trip() {
|
||||
let mut s = comp_session();
|
||||
|
||||
Reference in New Issue
Block a user