mirror of
https://github.com/p-stream/p-stream.git
synced 2026-04-21 12:42:17 +00:00
Add setting to make captions lower
This commit is contained in:
parent
df21c1e307
commit
648df78aad
5 changed files with 112 additions and 7 deletions
|
|
@ -766,7 +766,10 @@
|
||||||
"previewQuote": "Convinced life is meaningless, I lack the courage of my conviction.",
|
"previewQuote": "Convinced life is meaningless, I lack the courage of my conviction.",
|
||||||
"textSizeLabel": "Text size",
|
"textSizeLabel": "Text size",
|
||||||
"title": "Subtitles",
|
"title": "Subtitles",
|
||||||
"textBoldLabel": "Bold text"
|
"textBoldLabel": "Bold text",
|
||||||
|
"verticalPositionLabel": "Vertical position",
|
||||||
|
"default": "Default",
|
||||||
|
"low": "Low"
|
||||||
},
|
},
|
||||||
"unsaved": "You have unsaved changes... ฅ^•ﻌ•^ฅ"
|
"unsaved": "You have unsaved changes... ฅ^•ﻌ•^ฅ"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -325,6 +325,47 @@ export function CaptionSettingsView({
|
||||||
onChange={(v) => handleStylingChange({ ...styling, size: v / 100 })}
|
onChange={(v) => handleStylingChange({ ...styling, size: v / 100 })}
|
||||||
value={styling.size * 100}
|
value={styling.size * 100}
|
||||||
/>
|
/>
|
||||||
|
<div className="flex justify-between items-center">
|
||||||
|
<Menu.FieldTitle>
|
||||||
|
{t("settings.subtitles.verticalPositionLabel")}
|
||||||
|
</Menu.FieldTitle>
|
||||||
|
<div className="flex justify-center items-center space-x-2">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className={classNames(
|
||||||
|
"px-3 py-1 rounded transition-colors duration-100",
|
||||||
|
styling.verticalPosition === 3
|
||||||
|
? "bg-video-context-buttonFocus"
|
||||||
|
: "bg-video-context-buttonFocus bg-opacity-0 hover:bg-opacity-50",
|
||||||
|
)}
|
||||||
|
onClick={() =>
|
||||||
|
handleStylingChange({
|
||||||
|
...styling,
|
||||||
|
verticalPosition: 3,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{t("settings.subtitles.default")}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className={classNames(
|
||||||
|
"px-3 py-1 rounded transition-colors duration-100",
|
||||||
|
styling.verticalPosition === 1
|
||||||
|
? "bg-video-context-buttonFocus"
|
||||||
|
: "bg-video-context-buttonFocus bg-opacity-0 hover:bg-opacity-50",
|
||||||
|
)}
|
||||||
|
onClick={() =>
|
||||||
|
handleStylingChange({
|
||||||
|
...styling,
|
||||||
|
verticalPosition: 1,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{t("settings.subtitles.low")}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div className="flex justify-between items-center">
|
<div className="flex justify-between items-center">
|
||||||
<Menu.FieldTitle>
|
<Menu.FieldTitle>
|
||||||
{t("settings.subtitles.colorLabel")}
|
{t("settings.subtitles.colorLabel")}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
import classNames from "classnames";
|
|
||||||
import { useMemo } from "react";
|
import { useMemo } from "react";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
|
|
@ -123,6 +122,7 @@ export function SubtitleView(props: { controlsShown: boolean }) {
|
||||||
const captionAsTrack = usePlayerStore((s) => s.caption.asTrack);
|
const captionAsTrack = usePlayerStore((s) => s.caption.asTrack);
|
||||||
const display = usePlayerStore((s) => s.display);
|
const display = usePlayerStore((s) => s.display);
|
||||||
const isCasting = display?.getType() === "casting";
|
const isCasting = display?.getType() === "casting";
|
||||||
|
const styling = useSubtitleStore((s) => s.styling);
|
||||||
|
|
||||||
if (captionAsTrack || !caption || isCasting) return null;
|
if (captionAsTrack || !caption || isCasting) return null;
|
||||||
|
|
||||||
|
|
@ -133,10 +133,12 @@ export function SubtitleView(props: { controlsShown: boolean }) {
|
||||||
show
|
show
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className={classNames([
|
className="text-white absolute flex w-full flex-col items-center transition-[bottom]"
|
||||||
"text-white absolute flex w-full flex-col items-center transition-[bottom]",
|
style={{
|
||||||
props.controlsShown ? "bottom-24" : "bottom-12",
|
bottom: props.controlsShown
|
||||||
])}
|
? "6rem"
|
||||||
|
: `${styling.verticalPosition}rem`,
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<SubtitleRenderer />
|
<SubtitleRenderer />
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,12 @@ export function CaptionPreview(props: {
|
||||||
<Icon icon={props.fullscreen ? Icons.X : Icons.EXPAND} />
|
<Icon icon={props.fullscreen ? Icons.X : Icons.EXPAND} />
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div className="text-white pointer-events-none absolute flex w-full flex-col items-center transition-[bottom] bottom-0 p-4">
|
<div
|
||||||
|
className="text-white pointer-events-none absolute flex w-full flex-col items-center transition-[bottom] p-4"
|
||||||
|
style={{
|
||||||
|
bottom: `${props.styling.verticalPosition * 4}px`,
|
||||||
|
}}
|
||||||
|
>
|
||||||
<div
|
<div
|
||||||
className={
|
className={
|
||||||
props.fullscreen ? "" : "transform origin-bottom text-[0.5rem]"
|
props.fullscreen ? "" : "transform origin-bottom text-[0.5rem]"
|
||||||
|
|
@ -98,6 +103,7 @@ export function CaptionsPart(props: {
|
||||||
size: 1,
|
size: 1,
|
||||||
backgroundBlur: 0.5,
|
backgroundBlur: 0.5,
|
||||||
bold: false,
|
bold: false,
|
||||||
|
verticalPosition: 3,
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -145,6 +151,47 @@ export function CaptionsPart(props: {
|
||||||
}
|
}
|
||||||
value={props.styling.size * 100}
|
value={props.styling.size * 100}
|
||||||
/>
|
/>
|
||||||
|
<div className="flex justify-between items-center">
|
||||||
|
<Menu.FieldTitle>
|
||||||
|
{t("settings.subtitles.verticalPositionLabel")}
|
||||||
|
</Menu.FieldTitle>
|
||||||
|
<div className="flex justify-center items-center space-x-2">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className={classNames(
|
||||||
|
"px-3 py-1 rounded transition-colors duration-100",
|
||||||
|
props.styling.verticalPosition === 3
|
||||||
|
? "bg-video-context-buttonFocus"
|
||||||
|
: "bg-video-context-buttonFocus bg-opacity-0 hover:bg-opacity-50",
|
||||||
|
)}
|
||||||
|
onClick={() =>
|
||||||
|
handleStylingChange({
|
||||||
|
...props.styling,
|
||||||
|
verticalPosition: 3,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{t("settings.subtitles.default")}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className={classNames(
|
||||||
|
"px-3 py-1 rounded transition-colors duration-100",
|
||||||
|
props.styling.verticalPosition === 1
|
||||||
|
? "bg-video-context-buttonFocus"
|
||||||
|
: "bg-video-context-buttonFocus bg-opacity-0 hover:bg-opacity-50",
|
||||||
|
)}
|
||||||
|
onClick={() =>
|
||||||
|
handleStylingChange({
|
||||||
|
...props.styling,
|
||||||
|
verticalPosition: 1,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{t("settings.subtitles.low")}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div className="flex justify-between items-center">
|
<div className="flex justify-between items-center">
|
||||||
<Menu.FieldTitle>
|
<Menu.FieldTitle>
|
||||||
{t("settings.subtitles.textBoldLabel")}
|
{t("settings.subtitles.textBoldLabel")}
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,11 @@ export interface SubtitleStyling {
|
||||||
* bold, boolean
|
* bold, boolean
|
||||||
*/
|
*/
|
||||||
bold: boolean;
|
bold: boolean;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* vertical position percentage, ranges between 1 and 3 (rem)
|
||||||
|
*/
|
||||||
|
verticalPosition: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SubtitleStore {
|
export interface SubtitleStore {
|
||||||
|
|
@ -70,6 +75,7 @@ export const useSubtitleStore = create(
|
||||||
size: 1,
|
size: 1,
|
||||||
backgroundBlur: 0.5,
|
backgroundBlur: 0.5,
|
||||||
bold: false,
|
bold: false,
|
||||||
|
verticalPosition: 3,
|
||||||
},
|
},
|
||||||
showDelayIndicator: false,
|
showDelayIndicator: false,
|
||||||
resetSubtitleSpecificSettings() {
|
resetSubtitleSpecificSettings() {
|
||||||
|
|
@ -95,6 +101,11 @@ export const useSubtitleStore = create(
|
||||||
if (newStyling.size !== undefined)
|
if (newStyling.size !== undefined)
|
||||||
s.styling.size = Math.min(10, Math.max(0.01, newStyling.size));
|
s.styling.size = Math.min(10, Math.max(0.01, newStyling.size));
|
||||||
if (newStyling.bold !== undefined) s.styling.bold = newStyling.bold;
|
if (newStyling.bold !== undefined) s.styling.bold = newStyling.bold;
|
||||||
|
if (newStyling.verticalPosition !== undefined)
|
||||||
|
s.styling.verticalPosition = Math.min(
|
||||||
|
100,
|
||||||
|
Math.max(0, newStyling.verticalPosition),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
resetStyling() {
|
resetStyling() {
|
||||||
|
|
@ -105,6 +116,7 @@ export const useSubtitleStore = create(
|
||||||
size: 1,
|
size: 1,
|
||||||
backgroundBlur: 0.5,
|
backgroundBlur: 0.5,
|
||||||
bold: false,
|
bold: false,
|
||||||
|
verticalPosition: 3,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue