Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-21 00:59:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix issue with looping and separator

Browse source
This commit is contained in:
Jordan Eldredge 2019-02-17 15:03:28 -08:00
parent 1fdbbb844a
commit 6c28ac5386
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/components/MainWindow/Marquee.tsx
View file

@ -5,10 +5,11 @@ import { connect } from "react-redux";
import { STEP_MARQUEE } from "../../actionTypes";
import CharacterString from "../CharacterString";
import { getMediaText } from "../../selectors";
import { Slider, AppState, Dispatch } from "../../types";
import { AppState, Dispatch } from "../../types";
import * as Selectors from "../../selectors";
const SEPARATOR = " *** ";
interface StateProps {
marqueeStep: number;
text: string;
@ -45,7 +46,7 @@ export const stepOffset = (
const stepOffsetWidth = step * CHAR_WIDTH; // Steps move one char at a time
const offset = stepOffsetWidth + pixels;
const stringLength = text.length * CHAR_WIDTH;
const stringLength = (text.length + SEPARATOR.length) * CHAR_WIDTH;
return mod(offset, stringLength);
};
@ -55,7 +56,9 @@ export const pixelUnits = (pixels: number): string => `${pixels}px`;
// If text is wider than the marquee, it needs to loop
export const loopText = (text: string): string =>
isLong(text) ? `${text} *** ${text}` : text.padEnd(MARQUEE_MAX_LENGTH, " ");
isLong(text)
? `${text}${SEPARATOR}${text}`
: text.padEnd(MARQUEE_MAX_LENGTH, " ");
class Marquee extends React.Component<Props, State> {
stepHandle: NodeJS.Timer | null;