Skip to content

show timestamp on seekbar #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ac615223s5 wants to merge 1 commit into
base: master-backup
Choose a base branch
from
Open

show timestamp on seekbar #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions Grayjay.Desktop.Web/src/components/player/PlayerControlsView/index.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,23 +151,6 @@
text-align: center;
transform: translateX(-50%);
}
.progressBarChapter.hover .label {
display: block;
font-size: 11px;
text-wrap: nowrap;
white-space: nowrap;
position: absolute;
overflow: hidden;
text-overflow: ellipsis;
background-color: rgba(0,0,0,.8);
border-radius: 5px;
padding: 10px;
top: -50px;
left: 50%;
width: auto;
text-align: center;
transform: translateX(-50%);
}

.volumeBar {
position: absolute;
Expand Down
37 changes: 30 additions & 7 deletions Grayjay.Desktop.Web/src/components/player/PlayerControlsView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ const PlayerControlsView: Component<PlayerControlsProps> = (props) => {
let settingsButton: HTMLElement | undefined;
let containerRef: HTMLDivElement | undefined;
let scrubbing = false;
let seeking = false;
let changingVolume = false;
const [mouseSeekPosition,setMouseSeekPosition]=createSignal<Duration|undefined>();
const [mouseSeekOffset,setMouseSeekOffset]=createSignal(0);

const [progressBarChapterHovering$, setProgressBarChapterHovering] = createSignal<number>();

Expand Down Expand Up @@ -82,11 +85,17 @@ const PlayerControlsView: Component<PlayerControlsProps> = (props) => {
};

const scrub = (e: MouseEvent) => {
if (scrubbing && progressBar) {
if (progressBar) {
const d = untrack(progressBarDimensions);
setMouseSeekOffset(e.x-d.left);
const positionFraction = (e.x - d.left) / d.width;
const scrubPosition = Duration.fromMillis(positionFraction * props.duration.as("milliseconds"));
props.onSetPosition?.(scrubPosition);
const p=Duration.fromMillis(positionFraction * props.duration.as("milliseconds"));
if(seeking){
setMouseSeekPosition(p);
}
if(scrubbing){
props.onSetPosition?.(p);
}
props.onInteraction?.();
}
};
Expand Down Expand Up @@ -123,6 +132,7 @@ const PlayerControlsView: Component<PlayerControlsProps> = (props) => {
};

const onMouseOut = (e: MouseEvent) => {
seeking=false; setMouseSeekPosition(undefined);
stopScrubbing(e);
stopChangingVolume(e);
setProgressBarChapterHovering(-1);
Expand Down Expand Up @@ -405,6 +415,22 @@ const PlayerControlsView: Component<PlayerControlsProps> = (props) => {
<div class={styles.progressBarBuffer} style={{ width: `${bufferWidth()}px` }} />
<div class={styles.progressBarProgress} style={{ width: `${progressWidth()}px` }} />
<div class={styles.progressBarContainer}>
<Show when={mouseSeekPosition()!== undefined}>
<div class={styles.label} style={{
position: "absolute",
bottom: "0.5rem",
left: `calc(-4rem + ${mouseSeekOffset()}px)`,
width: "8rem",
"border-radius": "5px",
padding: "0.5rem",
"background-color": "rgb(from var(--black-color-3) r g b /.8)",
"font-size": "11px",
"text-align": "center",
}}>
<div>{props.chapters? props.chapters[progressBarChapterHovering$()??0]?.name:""}</div>
<div>{mouseSeekPosition()?.toISOTime()}</div>
</div>
</Show>
<Show when={(props.chapters?.length ?? 0) > 0}>
<div class={styles.progressBarChapters}>
<Index each={props.chapters}>{ (chapter$, i: number) =>
Expand All @@ -418,9 +444,6 @@ const PlayerControlsView: Component<PlayerControlsProps> = (props) => {
left: `calc(${(Math.max(1, chapter$().timeStart) / (props.duration.milliseconds / 1000)) * 100}% + 2px)`,
width: `calc(${((Math.min((props.duration.milliseconds / 1000), chapter$().timeEnd - chapter$().timeStart)) / (props.duration.milliseconds / 1000)) * 100}% - 2px)`,
}}>
<div class={styles.label}>
{chapter$().name}
</div>
<Show when={progressBarChapterHovering$() == i}>
<div class={styles.hoverBar}
style={{
Expand All @@ -446,7 +469,7 @@ const PlayerControlsView: Component<PlayerControlsProps> = (props) => {
</Show>
</div>
<div class={styles.progressBarHandle} style={{ left: `${progressHandleLeft()}px` }} />
<div class={styles.progressBarInteractiveArea} onMouseDown={startScrubbing} onMouseOut={onMouseOut} onMouseUp={stopScrubbing} onMouseMove={onMouseMove} />
<div class={styles.progressBarInteractiveArea} onMouseEnter={()=>{seeking=true}}onMouseDown={startScrubbing} onMouseOut={onMouseOut} onMouseUp={stopScrubbing} onMouseMove={onMouseMove} />

<div class={styles.leftButtonContainer} style={props.leftButtonContainerStyle}>
<img src={play} class={styles.play} alt="play" style={{display: !props.isPlaying ? "block" : "none" }} onClick={(ev)=>onPlay(ev)} />
Expand Down