Skip to content

Commit 112b237

Browse files
Fix image and grid not full height when in fullscreen mode
1 parent 7d2f59b commit 112b237

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

src/app/globals.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ body {
2020
height: calc(100vh - 48px);
2121
}
2222

23+
#main.fullscreen {
24+
width: auto;
25+
height: 100vh !important;
26+
}
27+
2328
#main .fullscreen,
2429
.fullscreen #imageCanvas img,
2530
.fullscreen #uploadArea {
@@ -34,6 +39,10 @@ body {
3439
max-height: calc(100vh - 48px);
3540
}
3641

42+
#imageCanvas.fs img {
43+
max-height: 100vh !important;
44+
}
45+
3746
#uploadArea {
3847
width: 100%;
3948
height: 100%;
@@ -53,6 +62,10 @@ body {
5362
max-height: calc(100vh - 48px);
5463
}
5564

65+
.fs.grid-overlay {
66+
max-height: 100vh !important;
67+
}
68+
5669
/* None */
5770
.grid-none #horizontalTop,
5871
.grid-none #horizontalBottom,

src/app/page.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ export default function Home() {
156156

157157
<main id="main" className={`flex justify-center items-center py-6 ${isFullscreen ? "fullscreen" : ""}`}>
158158
{file == null ? <UploadArea fileIsValid={fileIsValid} onFileUpload={handleFileUpload} onFileDrop={handleFileDrop}></UploadArea> :
159-
<ImageCanvas file={file} imageFilters={imageFilters} gridMode={gridMode} onFileDrop={handleFileDrop}></ImageCanvas>}
159+
<ImageCanvas file={file} imageFilters={imageFilters} gridMode={gridMode} onFileDrop={handleFileDrop} isFullscreen={isFullscreen}></ImageCanvas>}
160160
</main>
161161
</div>
162162
);

src/components/ImageCanvas.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function gridClassesFromId(gridModeId) {
2828
}
2929
}
3030

31-
export default function ImageCanvas({ file, imageFilters, gridMode, onFileDrop }) {
31+
export default function ImageCanvas({ file, imageFilters, gridMode, onFileDrop, isFullscreen }) {
3232
// List containing the one/two filter ids that are active.
3333
var activeIds = [];
3434
for (var i = 0; i < imageFilters.length; i++) {
@@ -38,7 +38,7 @@ export default function ImageCanvas({ file, imageFilters, gridMode, onFileDrop }
3838
}
3939
var showSlider = imageFilters.filter(i => i == true).length > 1;
4040
return (
41-
<div onDrop={(event) => onFileDrop(event)} onDragOver={(event) => event.preventDefault()} id="imageCanvas" className={`relative w-auto grid-overlay ${gridClassesFromId(gridMode)}`}>
41+
<div onDrop={(event) => onFileDrop(event)} onDragOver={(event) => event.preventDefault()} id="imageCanvas" className={`relative w-auto grid-overlay ${gridClassesFromId(gridMode)} ${isFullscreen == true ? "fs" : ""}`}>
4242
<div id="horizontalTop" className="absolute z-40 w-full h-[1px] bg-white/50"></div>
4343
<div id="horizontalBottom" className="absolute z-40 w-full h-[1px] bg-white/50"></div>
4444
<div id="verticalLeft" className="absolute z-40 w-[1px] h-full bg-white/50"></div>

0 commit comments

Comments
 (0)