Skip to content
Snippets Groups Projects
Commit 5d0fe72f authored by Paul Kaplan's avatar Paul Kaplan
Browse files

Make monitors position correctly in fullscreen

parent f62e4266
No related branches found
No related tags found
No related merge requests found
.monitor-list { .monitor-list {
width: 100%; /* Width/height are set by the component, margin: auto centers in fullscreen */
height: 100%; margin: auto;
pointer-events: none; pointer-events: none;
}
.monitor-list-scaler {
/* Scaling for monitors should happen from the top left */ /* Scaling for monitors should happen from the top left */
transform-origin: left top; transform-origin: left top;
} }
...@@ -18,29 +18,37 @@ const MonitorList = props => ( ...@@ -18,29 +18,37 @@ const MonitorList = props => (
// Use static `monitor-overlay` class for bounds of draggables // Use static `monitor-overlay` class for bounds of draggables
className={classNames(styles.monitorList, 'monitor-overlay')} className={classNames(styles.monitorList, 'monitor-overlay')}
style={{ style={{
transform: stageSizeToTransform(props.stageSize) width: props.stageSize.width,
height: props.stageSize.height
}} }}
> >
{props.monitors.valueSeq().filter(m => m.visible) <Box
.map(monitorData => ( className={styles.monitorListScaler}
<Monitor style={{
height={monitorData.height} transform: stageSizeToTransform(props.stageSize)
id={monitorData.id} }}
key={monitorData.id} >
max={monitorData.sliderMax} {props.monitors.valueSeq().filter(m => m.visible)
min={monitorData.sliderMin} .map(monitorData => (
mode={monitorData.mode} <Monitor
opcode={monitorData.opcode} height={monitorData.height}
params={monitorData.params} id={monitorData.id}
spriteName={monitorData.spriteName} key={monitorData.id}
targetId={monitorData.targetId} max={monitorData.sliderMax}
value={monitorData.value} min={monitorData.sliderMin}
width={monitorData.width} mode={monitorData.mode}
x={monitorData.x} opcode={monitorData.opcode}
y={monitorData.y} params={monitorData.params}
onDragEnd={props.onMonitorChange} spriteName={monitorData.spriteName}
/> targetId={monitorData.targetId}
))} value={monitorData.value}
width={monitorData.width}
x={monitorData.x}
y={monitorData.y}
onDragEnd={props.onMonitorChange}
/>
))}
</Box>
</Box> </Box>
); );
......
...@@ -20,7 +20,7 @@ class ListMonitorScroller extends React.Component { ...@@ -20,7 +20,7 @@ class ListMonitorScroller extends React.Component {
} }
noRowsRenderer () { noRowsRenderer () {
return ( return (
<div className={styles.listEmpty}> <div className={classNames(styles.listRow, styles.listEmpty)}>
{'(empty)' /* TODO waiting for design before translation */} {'(empty)' /* TODO waiting for design before translation */}
</div> </div>
); );
......
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
.value-inner { .value-inner {
padding: 3px 5px; padding: 3px 5px;
min-height: 22px; min-height: 22px;
overflow: hidden; /* Don't let long values escape container */
} }
.list-input { .list-input {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment