cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-22 07:29:08 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: subdue paused only for running timers

Browse Source
This commit is contained in:
Carlos Valente
2025-12-03 20:55:16 +01:00
committed by Carlos Valente
parent 03184b0321
commit 14e21214af
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/src/views/timer/Timer.tsx
+3 -2
View File
@@ -1,5 +1,5 @@
import { useMemo } from 'react'; import { useMemo } from 'react';
import { OntimeView } from 'ontime-types'; import { OntimeView, TimerType } from 'ontime-types';
import { FitText } from '../../common/components/fit-text/FitText'; import { FitText } from '../../common/components/fit-text/FitText';
import MultiPartProgressBar from '../../common/components/multi-part-progress-bar/MultiPartProgressBar'; import MultiPartProgressBar from '../../common/components/multi-part-progress-bar/MultiPartProgressBar';
@@ -133,6 +133,7 @@ function Timer({ customFields, projectData, isMirrored, settings, viewSettings }
// gather presentation styles // gather presentation styles
const resolvedTimerColour = getTimerColour(viewSettings, timerColour, showWarning, showDanger); const resolvedTimerColour = getTimerColour(viewSettings, timerColour, showWarning, showDanger);
const timerFontSize = getEstimatedFontSize(display, secondaryContent); const timerFontSize = getEstimatedFontSize(display, secondaryContent);
const subduePaused = !isPlaying && viewTimerType !== TimerType.Clock;
const userStyles = { const userStyles = {
...(keyColour && { '--timer-bg': keyColour }), ...(keyColour && { '--timer-bg': keyColour }),
...(resolvedTimerColour && { '--timer-colour': resolvedTimerColour }), ...(resolvedTimerColour && { '--timer-colour': resolvedTimerColour }),
@@ -177,7 +178,7 @@ function Timer({ customFields, projectData, isMirrored, settings, viewSettings }
</FitText> </FitText>
) : ( ) : (
<div <div
className={cx(['timer', !isPlaying && 'timer--paused', showFinished && 'timer--finished'])} className={cx(['timer', subduePaused && 'timer--paused', showFinished && 'timer--finished'])}
style={{ fontSize: `${timerFontSize}vw` }} style={{ fontSize: `${timerFontSize}vw` }}
data-type={viewTimerType} data-type={viewTimerType}
data-phase={time.phase} data-phase={time.phase}