From b15a18fb473656d141a60a4ffe00bc6e073bcb49 Mon Sep 17 00:00:00 2001 From: BFlat Date: Tue, 18 Jun 2024 02:03:14 +0700 Subject: [PATCH] compacted the timeline (#478) only height and padding styling updates to the timeline tracks and clips timeline now more compact and takes less space. ![image](https://github.com/storytold/GottaGoFast/assets/46063141/1451b5ce-b947-443d-984d-ac6f43190015) --- app/pages/PageEnigma/PageEditor.tsx | 2 +- .../comps/DragComponent/DragComponent.tsx | 4 +- app/pages/PageEnigma/comps/Timeline/Audio.tsx | 6 +-- .../PageEnigma/comps/Timeline/Camera.tsx | 6 +-- .../PageEnigma/comps/Timeline/Character.tsx | 8 ++-- .../PageEnigma/comps/Timeline/Characters.tsx | 2 +- .../comps/Timeline/ObjectGroups.tsx | 8 ++-- .../Timeline/RowHeaders/LipSyncSubHeader.tsx | 2 +- .../comps/Timeline/RowHeaders/RowHeaders.tsx | 44 ++++++++++--------- .../PageEnigma/comps/Timeline/Scrubber.tsx | 4 +- .../PageEnigma/comps/Timeline/Timeline.tsx | 10 ++--- .../PageEnigma/comps/Timeline/TimerGrid.tsx | 12 ++--- .../PageEnigma/comps/Timeline/TrackClip.tsx | 12 ++--- .../PageEnigma/comps/Timeline/TrackClips.tsx | 6 +-- .../comps/Timeline/TrackKeyFrame.tsx | 2 +- .../comps/Timeline/TrackKeyFrames.tsx | 2 +- 16 files changed, 66 insertions(+), 64 deletions(-) diff --git a/app/pages/PageEnigma/PageEditor.tsx b/app/pages/PageEnigma/PageEditor.tsx index fe2beb03f9..4ccac5e97d 100644 --- a/app/pages/PageEnigma/PageEditor.tsx +++ b/app/pages/PageEnigma/PageEditor.tsx @@ -31,7 +31,7 @@ export const PageEditor = () => { }; useEffect(() => { - timelineHeight.value = window.innerHeight * 0.25; + timelineHeight.value = 208; sidePanelWidth.value = 340; window.onbeforeunload = () => { return "You may have unsaved changes."; diff --git a/app/pages/PageEnigma/comps/DragComponent/DragComponent.tsx b/app/pages/PageEnigma/comps/DragComponent/DragComponent.tsx index f1c95b1ab5..6d869223a3 100644 --- a/app/pages/PageEnigma/comps/DragComponent/DragComponent.tsx +++ b/app/pages/PageEnigma/comps/DragComponent/DragComponent.tsx @@ -28,7 +28,7 @@ export const DragComponent = () => { id={`ani-dnd-${dragItem.value.media_id}`} className={[ "absolute p-2", - "rounded-lg", + "rounded-md", !canDrop.value ? "bg-brand-primary" : "border border-dashed border-dnd-canDropBorder bg-dnd-canDrop", @@ -39,7 +39,7 @@ export const DragComponent = () => { left: currX + 1, zIndex: 10000, width: (dragItem.value.length ?? 0) * 4 * scale.value, - height: 32, + height: 30, }} />
{ return (
-
+
{ return (
-
+
{ return (
-
+
{ return ( <> {characterGroup.value.characters.map((character) => ( -
+
))} diff --git a/app/pages/PageEnigma/comps/Timeline/ObjectGroups.tsx b/app/pages/PageEnigma/comps/Timeline/ObjectGroups.tsx index 983eced61f..b670de54c2 100644 --- a/app/pages/PageEnigma/comps/Timeline/ObjectGroups.tsx +++ b/app/pages/PageEnigma/comps/Timeline/ObjectGroups.tsx @@ -21,7 +21,7 @@ export const ObjectGroups = () => { return (
-
+
{objectGroup.value.objects.map((object) => (
diff --git a/app/pages/PageEnigma/comps/Timeline/RowHeaders/LipSyncSubHeader.tsx b/app/pages/PageEnigma/comps/Timeline/RowHeaders/LipSyncSubHeader.tsx index f9d64420b0..ac49f8ab51 100644 --- a/app/pages/PageEnigma/comps/Timeline/RowHeaders/LipSyncSubHeader.tsx +++ b/app/pages/PageEnigma/comps/Timeline/RowHeaders/LipSyncSubHeader.tsx @@ -13,7 +13,7 @@ export const LipSyncSubHeader = ({ const editorEngine = useContext(EngineContext); if (editorEngine && editorEngine.isObjectLipsync(character.object_uuid)) { return ( -
+
Lip Sync diff --git a/app/pages/PageEnigma/comps/Timeline/TrackClips.tsx b/app/pages/PageEnigma/comps/Timeline/TrackClips.tsx index e19a53545b..7d7cbf81e9 100644 --- a/app/pages/PageEnigma/comps/Timeline/TrackClips.tsx +++ b/app/pages/PageEnigma/comps/Timeline/TrackClips.tsx @@ -152,14 +152,14 @@ export const TrackClips = ({ id, clips, updateClip, group, type }: Props) => {
{ return (