diff options
| author | Maze Winther <mazewinther@gmail.com> | 2025-07-22 11:41:58 +0200 |
|---|---|---|
| committer | Maze Winther <mazewinther@gmail.com> | 2025-07-22 11:41:58 +0200 |
| commit | fb5dca9f9d02a8e01a5189c4a8cf864d7a343b7e (patch) | |
| tree | 3b2755097baa487e4447a973890be9f59f7d2689 /apps/web/src/components/editor | |
| parent | c783062121a4a31ec6ee20c4ca52fd47f4fbdab7 (diff) | |
| parent | a5f7b477e65e5acba56b8761cd9cd3074cdb41ac (diff) | |
| download | opencut-fb5dca9f9d02a8e01a5189c4a8cf864d7a343b7e.tar.gz | |
Merge branch 'main' into staging
Diffstat (limited to 'apps/web/src/components/editor')
| -rw-r--r-- | apps/web/src/components/editor/timeline/index.tsx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/apps/web/src/components/editor/timeline/index.tsx b/apps/web/src/components/editor/timeline/index.tsx index 993aa6ad..5316355d 100644 --- a/apps/web/src/components/editor/timeline/index.tsx +++ b/apps/web/src/components/editor/timeline/index.tsx @@ -15,8 +15,7 @@ import { Video, Music, TypeIcon, - Lock, - LockOpen, + Magnet, Link, ZoomIn, ZoomOut, @@ -279,7 +278,7 @@ export function Timeline() { Math.min( duration, (mouseX + scrollLeft) / - (TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel) + (TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel) ) ); @@ -599,21 +598,19 @@ export function Timeline() { return ( <div key={i} - className={`absolute top-0 bottom-0 ${ - isMainMarker + className={`absolute top-0 bottom-0 ${isMainMarker ? "border-l border-muted-foreground/40" : "border-l border-muted-foreground/20" - }`} + }`} style={{ left: `${time * TIMELINE_CONSTANTS.PIXELS_PER_SECOND * zoomLevel}px`, }} > <span - className={`absolute top-1 left-1 text-[0.6rem] ${ - isMainMarker + className={`absolute top-1 left-1 text-[0.6rem] ${isMainMarker ? "text-muted-foreground font-medium" : "text-muted-foreground/70" - }`} + }`} > {(() => { const formatTime = (seconds: number) => { |