Let composition items overlap and show where their video lies (#417)
Trying the tab turned up six things to fix. Items of a track could not overlap, so a drag stalled as soon as the pointer reached another item. An item's ends gave no hint they could be dragged, a trimmed video showed nowhere, clip names were hard to read and vanished when picked, and the track menu did not match the song tab. - Items of a track may overlap and nothing is cut or pushed aside. The later one lies in front, in the picture and on the timeline. The overlap is shaded and a line marks the covered end. - Edges win over bodies when hit, so the covered end of the lower item can still be dragged. Hovering an edge lights it up and shows the ew-resize cursor, as in the song tab. - A clip in the overlap plays on both items. Clips themselves still do not overlap; a moved clip now runs up to its neighbour instead of stopping short. - Fit to media and a new video no longer cap the length at the next item, which only made sense while overlaps were forbidden. - The left edge can be trimmed past the start of the video. The offset goes negative and the sprite shows the first picture until the video begins. - Video marks: a corner triangle where the item cuts into its video, a line with a triangle like the song loop where the video starts or ends inside the item. Edges snap to the video's ends within 6 px. - Clip names sit in their own layer above the bars, in text colour. - The track menu matches the song tab: add above or below, move up or down, delete. It opens on the head and on an empty spot of the track. The Remove track button left the inspector. Tests: - Unit composition and composition-edit: 67 green, several new or rewritten. Bending three spots in the rules turned their tests red. - e2e 69: ALL PASSED, 12 checks. 69b and 69c now drop the second item over the first and drag the covered end past it. Without edges winning the hit, 69c fails with hover: null. - Gate on melektaus-atx: CHECK EXIT 0, 302 files, 4672 tests. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
4f0272638e
commit
c4650e43f0
10 files changed
+559
-227
No files matched your search
@@ -358,6 +358,29 @@ describe('animation clips', () => {
|
||||
expect(x(42, second)).toBe(70);
|
||||
});
|
||||
|
||||
it('over two items of a track that overlap, play on both – the later one in front', () => {
|
||||
const cut = makeCut();
|
||||
const track = firstTrack(cut);
|
||||
const early = cut.item(track, cut.spriteId, 0, 60);
|
||||
const late = cut.item(track, cut.spriteId, 30, 60);
|
||||
cut.clip(
|
||||
track,
|
||||
cut.animation(cut.spriteId, [
|
||||
[
|
||||
'x',
|
||||
[
|
||||
[0, 0],
|
||||
[9, 90],
|
||||
],
|
||||
],
|
||||
]),
|
||||
0,
|
||||
);
|
||||
expect(liveIds(cut, 42)).toEqual([early, late]);
|
||||
const holder = compositionHolder(cut.project, cut.comp(), 42);
|
||||
expect([early, late].map((id) => holder.objects.find((o) => o.id === id)!.position.x)).toEqual([70, 70]);
|
||||
});
|
||||
|
||||
it('add a relative row to the value the item has', () => {
|
||||
const cut = makeCut();
|
||||
const item = cut.item(firstTrack(cut), cut.spriteId, 0, 120);
|
||||
@@ -610,7 +633,7 @@ describe('saving and loading a composition', () => {
|
||||
expect(loaded.clips).toEqual([]);
|
||||
});
|
||||
|
||||
it('keeps every object at the top level, a negative offset at 0 and at least one track', () => {
|
||||
it('keeps every object at the top level, a negative offset, and at least one track', () => {
|
||||
const cut = makeCut();
|
||||
const track = firstTrack(cut);
|
||||
const parent = cut.item(track, cut.spriteId, 0, 10);
|
||||
@@ -624,7 +647,7 @@ describe('saving and loading a composition', () => {
|
||||
expect(loaded.items).toEqual([]);
|
||||
const again = findAssetOf(roundTrip(cut.project), cut.compId, 'composition')!;
|
||||
expect(again.objects.map((o) => o.parentId)).toEqual(['', '']);
|
||||
expect(again.items.find((i) => i.id === child)!.offset).toBe(0);
|
||||
expect(again.items.find((i) => i.id === child)!.offset).toBe(-3);
|
||||
expect(again.items.some((i) => 'fitMedia' in i)).toBe(false);
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user