Skip to content

fix(inventory): scale 3D modal with viewport, unify market action row #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ykns3 merged 2 commits into from
Aug 7, 2026
Merged

fix(inventory): scale 3D modal with viewport, unify market action row #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ae8448
fix(inventory): scale 3D modal with viewport, unify market action row
ykns3 Aug 4, 2026
65e35c4
fix(inventory): cap 3D modal width on very large displays
ykns3 Aug 5, 2026
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
26 changes: 17 additions & 9 deletions src/lib/components/common/skincraft_viewer_modal_styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@ export const skinCraftViewerModalStyles = `
font-family: Arial, Helvetica, sans-serif;
}

/* Width follows the viewport; the height-derived term caps the 16:9 stage at 80vh so the
composition scales with the screen. The 1920px ceiling is the stage's native resolution —
past it 4K+ displays only upscale. */
dialog {
width: min(1120px, calc(100vw - 48px));
width: min(90vw, calc(80vh * 16 / 9), 1920px);
width: min(90vw, calc(80dvh * 16 / 9), 1920px);
max-width: none;
padding: 0;
border: 1px solid rgba(193, 206, 255, 0.12);
Expand Down Expand Up @@ -429,8 +433,10 @@ export const skinCraftViewerModalStyles = `
}

@media (min-width: 1168px) and (max-width: 1519px) and (min-height: 840px) {
/* The 122px item strip sits above the stage, so it joins the height budget. */
dialog.has-items {
width: 1120px;
width: max(1120px, min(90vw, calc((80vh - 122px) * 16 / 9)));
width: max(1120px, min(90vw, calc((80dvh - 122px) * 16 / 9)));
}

dialog.has-items .modal-body {
Expand Down Expand Up @@ -463,19 +469,25 @@ export const skinCraftViewerModalStyles = `
}

@media (min-width: 1520px) {
/* The 320px item panel sits beside the stage, so it joins the width budget instead. */
dialog.has-items {
width: min(1440px, calc(100vw - 48px));
width: min(90vw, calc(80vh * 16 / 9 + 320px), 2240px);
width: min(90vw, calc(80dvh * 16 / 9 + 320px), 2240px);
}

dialog.has-items .modal-body {
display: grid;
grid-template-columns: minmax(280px, 320px) 1120px;
grid-template-columns: 320px minmax(0, 1fr);
}

dialog.has-items .item-panel {
display: flex;
flex-direction: column;
height: min(630px, calc(100vh - 104px));
/* The stage's height (its column width at 16:9), restated because the panel's own
content must not be what sizes the shared grid row. Tracks the same 2240px ceiling
as the dialog, or it would outgrow the stage it sits beside. */
height: min(calc((min(90vw, 2240px) - 320px) * 9 / 16), 80vh);
height: min(calc((min(90vw, 2240px) - 320px) * 9 / 16), 80dvh);
border-right: 1px solid rgba(193, 206, 255, 0.1);
}

Expand All @@ -499,10 +511,6 @@ export const skinCraftViewerModalStyles = `
dialog.has-items .item-card {
height: 92px;
}

dialog.has-items .viewer-stage {
width: 1120px;
}
}

@media (max-width: 640px) {
Expand Down
18 changes: 9 additions & 9 deletions src/lib/components/inventory/selected_item_info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ export class SelectedItemInfo extends FloatElement {
flex-wrap: wrap;
align-items: center;
gap: 10px;
margin: 14px 0 10px;
}

.market-btn-container {
margin: 10px 0 10px 0;
padding: 5px;
width: fit-content;
border: solid 1px rgb(56 64 77);
Expand Down Expand Up @@ -219,19 +219,19 @@ export class SelectedItemInfo extends FloatElement {
);
}

if (this.canListOnCSFloat || this.show3dButton) {
// The modal lives outside the flex row: as a flex item its host would add a gap and
// nudge the 3D button whenever it mounts.
if (this.canListOnCSFloat || this.show3dButton || this.stallListing) {
// One flex row for every action: the market action (list button or active listing —
// mutually exclusive) keeps the left slot in both states, and nothing wraps while
// there's room. The modal lives outside the row: as a flex item its host would add a
// gap and nudge the 3D button whenever it mounts.
containerChildren.push(
html`<div class="market-btn-row">${this.renderListOnCSFloat()} ${this.renderViewIn3D()}</div>
html`<div class="market-btn-row">
${this.renderListOnCSFloat()} ${this.renderFloatMarketListing()} ${this.renderViewIn3D()}
</div>
${this.renderListModal()}`
);
}

if (isSellableOnCSFloat(this.asset.description)) {
containerChildren.push(this.renderFloatMarketListing());
}

if (containerChildren.length === 0) {
return html``;
}
Expand Down