Skip to content

🎥 Make videos programmatically with React

fix(studio): Correct composition icon geometry and pixel alignment

Jonny Burger45bc311e8ff9
diff --git a/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx b/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx
index 4d01e5c94f..ebc3006e2d 100644
--- a/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx
+++ b/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx
@@ -134,12 +134,6 @@ const labelContainerStyle: React.CSSProperties = {
minWidth: 0,
};
-const connectedCompositionIconStyle: React.CSSProperties = {
- flexShrink: 0,
- height: 12,
- width: 12,
-};
-
const effectDropHighlight: React.CSSProperties = {
backgroundColor: TIMELINE_DROP_BLUE_ALPHA_16,
outline: BORDER_TIMELINE_DROP_BLUE,
@@ -1085,6 +1079,17 @@ const TimelineSequenceItemInner: React.FC<{
[sequence.type],
);
+ const connectedCompositionIconStyle = useMemo(
+ (): React.CSSProperties => ({
+ flexShrink: 0,
+ height: 12,
+ // Center the icon on whole pixels, including in taller audio/video rows.
+ marginBottom: (outerHeight - TIMELINE_ITEM_BORDER_BOTTOM) % 2,
+ width: 12,
+ }),
+ [outerHeight],
+ );
+
const inner: React.CSSProperties = useMemo(() => {
return {
height: TIMELINE_LIST_ITEM_ROW_HEIGHT,
diff --git a/packages/studio/src/icons/video.tsx b/packages/studio/src/icons/video.tsx
index bb1bdd5b32..1252d59335 100644
--- a/packages/studio/src/icons/video.tsx
+++ b/packages/studio/src/icons/video.tsx
@@ -33,7 +33,7 @@ export const FilmIcon: React.FC<
fill={color}
d={`M${sideWidth + 1} 2h1v${size - 4}h-1z
M${size - sideWidth - 2} 2h1v${size - 4}h-1z
- M1 ${upperFrameBottom}h${size - 2}v2H1z
+ M${sideWidth + 2} ${upperFrameBottom}h${size - 2 * sideWidth - 4}v1h-${size - 2 * sideWidth - 4}z
M1 ${topDivider}h${sideWidth}v1H1z
M${size - sideWidth - 1} ${topDivider}h${sideWidth}v1h-${sideWidth}z
M1 ${bottomDivider}h${sideWidth}v1H1z