Skip to content

🎥 Make videos programmatically with React

Improve nested timeline label spacing and source trim targets

JonnyBurgerc4e07164bd22
diff --git a/packages/studio/src/components/Timeline/TimelineSequence.tsx b/packages/studio/src/components/Timeline/TimelineSequence.tsx
index d06d6321a2..e548cfbf81 100644
--- a/packages/studio/src/components/Timeline/TimelineSequence.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequence.tsx
@@ -511,6 +511,14 @@ const TimelineSequenceBar: React.FC<{
labelLeft = Math.max(labelLeft, afterTransition - Number(style.marginLeft));
}
+ if (isPackedClip && inheritedSceneRange !== null && frameIncrement !== null) {
+ const inheritedLeft =
+ Math.round(inheritedSceneRange.from * frameIncrement) +
+ Number(inheritedSceneRange.transitionInEnd !== null) -
+ Number(style.marginLeft);
+ labelLeft = Math.max(labelLeft, Math.max(0, inheritedLeft) + 4);
+ }
+
const labelEndFrame = Math.min(
sceneRange?.transitionOutStart ?? Infinity,
inheritedSceneRange?.transitionOutStart ?? Infinity,
diff --git a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
index 7539435862..1301bdda7e 100644
--- a/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceRightEdgeDragHandle.tsx
@@ -2599,7 +2599,9 @@ const TimelineSequenceLeftEdgeDragHandleInner: React.FC<{
width:
rollingEnabled || touchingPrevious
? 'min(10px, 12.5%)'
- : `calc(${LEFT_EDGE_HANDLE_OUTSET}px + min(${LEFT_EDGE_HANDLE_INSET}px, 12.5%))`,
+ : edgeMode === 'source-only'
+ ? `calc(${LEFT_EDGE_HANDLE_OUTSET}px + min(14px, 25%))`
+ : `calc(${LEFT_EDGE_HANDLE_OUTSET}px + min(${LEFT_EDGE_HANDLE_INSET}px, 12.5%))`,
cursor:
edgeMode === 'ripple'
? cursor