Fix drag-and-drop of a future frame after a frame in the past

This commit is contained in:
David Capello 2015-03-12 19:15:42 -03:00
parent 602ca6a7b7
commit 6800302d34
2 changed files with 5 additions and 2 deletions

View File

@ -189,7 +189,7 @@ static DocumentRange drop_range_op(
srcFrameBegin = from.frameBegin();
srcFrameStep = frame_t(1);
srcFrameEnd = from.frameEnd()+1;
dstFrameBegin = to.frameEnd();
dstFrameBegin = to.frameEnd()+1;
dstFrameStep = frame_t(1);
}
else {

View File

@ -676,8 +676,11 @@ TEST_F(DocRangeOps, MoveFrames) {
EXPECT_FRAME_ORDER(0, 1, 2, 3);
move_range(doc,
frames_range(1, 2),
frames_range(2, 3),
frames_range(0, 0), kDocumentRangeAfter);
EXPECT_FRAME_ORDER(0, 2, 3, 1);
doc->undoHistory()->undo();
EXPECT_FRAME_ORDER(0, 1, 2, 3);
// Move three frames at the beginning