Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
69 changes: 46 additions & 23 deletions src/frontend/components/Settings/sections/RelativeSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -373,29 +373,52 @@ const DisplaySettingsList = ({
{setting.hasSubSetting &&
setting.configKey === 'lapTimeDeltas' &&
settings.config.lapTimeDeltas.enabled && (
<div className="flex items-center justify-between pl-8 mt-2 indent-8">
<span className="text-sm text-slate-300">
Number of Laps to Show
</span>
<select
value={settings.config.lapTimeDeltas.numLaps}
onChange={(e) =>
handleConfigChange({
lapTimeDeltas: {
...settings.config.lapTimeDeltas,
numLaps: parseInt(e.target.value),
},
})
}
className="bg-slate-700 text-white rounded-md px-2 py-1"
>
<option value={1}>1</option>
<option value={2}>2</option>
<option value={3}>3</option>
<option value={4}>4</option>
<option value={5}>5</option>
</select>
</div>
<>
<div className="flex items-center justify-between pl-8 mt-2 indent-8">
<span className="text-sm text-slate-300">
Number of Laps to Show
</span>
<select
value={settings.config.lapTimeDeltas.numLaps}
onChange={(e) =>
handleConfigChange({
lapTimeDeltas: {
...settings.config.lapTimeDeltas,
numLaps: parseInt(e.target.value),
},
})
}
className="bg-slate-700 text-white rounded-md px-2 py-1"
>
<option value={1}>1</option>
<option value={2}>2</option>
<option value={3}>3</option>
<option value={4}>4</option>
<option value={5}>5</option>
</select>
</div>
<div className="flex items-center justify-between pl-8 mt-2 indent-8">
<span className="text-sm text-slate-300">
Decimal Places
</span>
<select
value={settings.config.lapTimeDeltas.decimalPlaces ?? 1}
onChange={(e) =>
handleConfigChange({
lapTimeDeltas: {
...settings.config.lapTimeDeltas,
decimalPlaces: parseInt(e.target.value, 10),
},
})
}
className="bg-slate-700 text-white rounded-md px-2 py-1"
>
<option value={1}>1</option>
<option value={2}>2</option>
<option value={3}>3</option>
</select>
</div>
</>
)}
</DraggableSettingItem>
);
Expand Down
69 changes: 46 additions & 23 deletions src/frontend/components/Settings/sections/StandingsSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,29 +140,52 @@ const DisplaySettingsList = ({
{setting.hasSubSetting &&
setting.configKey === 'lapTimeDeltas' &&
settings.config.lapTimeDeltas.enabled && (
<div className="flex items-center justify-between pl-8 mt-2 indent-8">
<span className="text-sm text-slate-300">
Number of Laps to Show
</span>
<select
value={settings.config.lapTimeDeltas.numLaps}
onChange={(e) =>
handleConfigChange({
lapTimeDeltas: {
...settings.config.lapTimeDeltas,
numLaps: parseInt(e.target.value),
},
})
}
className="bg-slate-700 text-white rounded-md px-2 py-1"
>
<option value={1}>1</option>
<option value={2}>2</option>
<option value={3}>3</option>
<option value={4}>4</option>
<option value={5}>5</option>
</select>
</div>
<>
<div className="flex items-center justify-between pl-8 mt-2 indent-8">
<span className="text-sm text-slate-300">
Number of Laps to Show
</span>
<select
value={settings.config.lapTimeDeltas.numLaps}
onChange={(e) =>
handleConfigChange({
lapTimeDeltas: {
...settings.config.lapTimeDeltas,
numLaps: parseInt(e.target.value),
},
})
}
className="bg-slate-700 text-white rounded-md px-2 py-1"
>
<option value={1}>1</option>
<option value={2}>2</option>
<option value={3}>3</option>
<option value={4}>4</option>
<option value={5}>5</option>
</select>
</div>
<div className="flex items-center justify-between pl-8 mt-2 indent-8">
<span className="text-sm text-slate-300">
Decimal Places
</span>
<select
value={settings.config.lapTimeDeltas.decimalPlaces ?? 1}
onChange={(e) =>
handleConfigChange({
lapTimeDeltas: {
...settings.config.lapTimeDeltas,
decimalPlaces: parseInt(e.target.value, 10),
},
})
}
className="bg-slate-700 text-white rounded-md px-2 py-1"
>
<option value={1}>1</option>
<option value={2}>2</option>
<option value={3}>3</option>
</select>
</div>
</>
)}
{setting.hasSubSetting &&
setting.configKey === 'avgLapTime' &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ const RelativeWithReorderableConfig = () => {
compound: { enabled: true },
brakeBias: { enabled: false },
driverTag: { enabled: false },
lapTimeDeltas: { enabled: false, numLaps: 3 },
lapTimeDeltas: { enabled: false, numLaps: 3, decimalPlaces: 1 },
displayOrder: displayOrder,
titleBar: { enabled: true, progressBar: { enabled: true } },
headerBar: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,11 @@ export const DriverInfoRow = memo((props: DriverRowInfoProps) => {
emptyLapDeltaPlaceholders={emptyLapDeltaPlaceholders}
isPlayer={isPlayer}
compactMode={compactMode}
decimalPlaces={
config && 'lapTimeDeltas' in config
? (config.lapTimeDeltas.decimalPlaces ?? 1)
: 1
}
/>
),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ interface LapTimeDeltasCellProps {
emptyLapDeltaPlaceholders: number[] | null;
isPlayer: boolean;
compactMode?: string;
decimalPlaces?: number;
Comment thread
tariknz marked this conversation as resolved.
}

export const LapTimeDeltasCell = memo(
Expand All @@ -13,6 +14,7 @@ export const LapTimeDeltasCell = memo(
emptyLapDeltaPlaceholders,
isPlayer,
compactMode,
decimalPlaces,
}: LapTimeDeltasCellProps) => {
const pxClass = compactMode === 'ultra' ? '' : 'px-1';

Expand All @@ -31,7 +33,7 @@ export const LapTimeDeltasCell = memo(
data-column="lapTimeDelta"
className={`w-auto ${pxClass} text-center whitespace-nowrap ${deltaValue > 0 ? 'text-green-400' : 'text-red-400'}`}
>
{Math.abs(deltaValue).toFixed(1)}
{Math.abs(deltaValue).toFixed(decimalPlaces)}
</td>
);
} else {
Expand Down
2 changes: 2 additions & 0 deletions src/types/defaultDashboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export const defaultDashboard: {
lapTimeDeltas: {
enabled: false,
numLaps: 3,
decimalPlaces: 1,
},
avgLapTime: {
enabled: false,
Expand Down Expand Up @@ -443,6 +444,7 @@ export const defaultDashboard: {
lapTimeDeltas: {
enabled: false,
numLaps: 3,
decimalPlaces: 1,
},
displayOrder: [
'position',
Expand Down
4 changes: 2 additions & 2 deletions src/types/widgetConfigs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export interface StandingsConfig {
};
compound: { enabled: boolean };
carManufacturer: { enabled: boolean; hideIfSingleMake?: boolean };
lapTimeDeltas: { enabled: boolean; numLaps: number };
lapTimeDeltas: { enabled: boolean; numLaps: number; decimalPlaces: number };
avgLapTime: { enabled: boolean; numLaps: number; timeFormat: TimeFormat };
titleBar: { enabled: boolean; progressBar: { enabled: boolean } };
headerBar: SessionBarConfig;
Expand Down Expand Up @@ -192,7 +192,7 @@ export interface RelativeConfig {
teamName: { enabled: boolean };
pitStatus: PitStatusConfig;
driverTag: { enabled: boolean; widthPx?: number };
lapTimeDeltas: { enabled: boolean; numLaps: number };
lapTimeDeltas: { enabled: boolean; numLaps: number; decimalPlaces: number };
displayOrder: string[];
useLivePosition?: boolean;
sessionVisibility: SessionVisibilitySettings;
Expand Down
Loading