Skip to content
Snippets Groups Projects

Scale slide and time left text

Merged Albin Henriksson requested to merge 186-improve-scaling into dev
2 files
+ 19
6
Compare changes
  • Side-by-side
  • Inline
Files
2
@@ -5,7 +5,7 @@ import { useAppDispatch, useAppSelector } from '../../../hooks'
@@ -5,7 +5,7 @@ import { useAppDispatch, useAppSelector } from '../../../hooks'
import PresentationComponent from '../../views/components/PresentationComponent'
import PresentationComponent from '../../views/components/PresentationComponent'
import Timer from '../../views/components/Timer'
import Timer from '../../views/components/Timer'
import RndComponent from './RndComponent'
import RndComponent from './RndComponent'
import { Center, SlideEditorContainer, SlideEditorContainerRatio, SlideEditorPaper } from './styled'
import { Center, SlideDisplayText, SlideEditorContainer, SlideEditorContainerRatio, SlideEditorPaper } from './styled'
type SlideDisplayProps = {
type SlideDisplayProps = {
//Prop to distinguish between editor and active competition
//Prop to distinguish between editor and active competition
@@ -59,13 +59,13 @@ const SlideDisplay = ({ variant, activeViewTypeId, currentSlideId }: SlideDispla
@@ -59,13 +59,13 @@ const SlideDisplay = ({ variant, activeViewTypeId, currentSlideId }: SlideDispla
<SlideEditorContainer>
<SlideEditorContainer>
<SlideEditorContainerRatio>
<SlideEditorContainerRatio>
<SlideEditorPaper ref={editorPaperRef}>
<SlideEditorPaper ref={editorPaperRef}>
<Typography variant="h3" style={{ position: 'absolute', left: 5, top: 5 }}>
<SlideDisplayText scale={scale}>
{variant === 'editor' && `Tid kvar: ${slide?.timer}`}
{variant === 'editor' && slide?.timer ? `Tid kvar: ${slide?.timer}` : ''}
{variant === 'presentation' && <Timer />}
{variant === 'presentation' && <Timer />}
</Typography>
</SlideDisplayText>
<Typography variant="h3" style={{ position: 'absolute', right: 5, top: 5 }}>
<SlideDisplayText scale={scale} right>
{slide && `Sida: ${slide?.order + 1} / ${totalSlides}`}
{slide && `Sida: ${slide?.order + 1} / ${totalSlides}`}
</Typography>
</SlideDisplayText>
{(competitionBackgroundImage || slideBackgroundImage) && (
{(competitionBackgroundImage || slideBackgroundImage) && (
<img
<img
src={`/static/images/${
src={`/static/images/${
Loading