mirror of
https://github.com/OpenCut-app/OpenCut.git
synced 2026-07-13 21:52:53 +02:00
Merge branch 'staging' of https://github.com/mazeincoding/AppCut into staging
This commit is contained in:
@@ -41,7 +41,7 @@ export function PropertiesPanel() {
|
|||||||
label="Resolution:"
|
label="Resolution:"
|
||||||
value={`${canvasSize.width} × ${canvasSize.height}`}
|
value={`${canvasSize.width} × ${canvasSize.height}`}
|
||||||
/>
|
/>
|
||||||
<div className="flex justify-between items-center">
|
<div className="flex flex-col gap-1">
|
||||||
<Label className="text-xs text-muted-foreground">Frame rate:</Label>
|
<Label className="text-xs text-muted-foreground">Frame rate:</Label>
|
||||||
<Select
|
<Select
|
||||||
value={(activeProject?.fps || 30).toString()}
|
value={(activeProject?.fps || 30).toString()}
|
||||||
@@ -101,9 +101,9 @@ export function PropertiesPanel() {
|
|||||||
|
|
||||||
function PropertyItem({ label, value }: { label: string; value: string }) {
|
function PropertyItem({ label, value }: { label: string; value: string }) {
|
||||||
return (
|
return (
|
||||||
<div className="flex justify-between">
|
<div className="flex flex-col gap-1">
|
||||||
<Label className="text-xs text-muted-foreground">{label}</Label>
|
<Label className="text-xs text-muted-foreground">{label}</Label>
|
||||||
<span className="text-xs text-right truncate w-40" title={value}>
|
<span className="text-xs break-words" title={value}>
|
||||||
{value}
|
{value}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -71,6 +71,20 @@ export function TextProperties({
|
|||||||
</div>
|
</div>
|
||||||
</PropertyItemValue>
|
</PropertyItemValue>
|
||||||
</PropertyItem>
|
</PropertyItem>
|
||||||
|
<PropertyItem direction="row">
|
||||||
|
<PropertyItemLabel>Color</PropertyItemLabel>
|
||||||
|
<PropertyItemValue>
|
||||||
|
<Input
|
||||||
|
type="color"
|
||||||
|
value={element.color || "#ffffff"}
|
||||||
|
onChange={(e) => {
|
||||||
|
const color = e.target.value;
|
||||||
|
updateTextElement(trackId, element.id, { color });
|
||||||
|
}}
|
||||||
|
className="w-full cursor-pointer rounded-full"
|
||||||
|
/>
|
||||||
|
</PropertyItemValue>
|
||||||
|
</PropertyItem>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user