Skip to content

Reserve the UI bar height when scaling the game area #37

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

Open
soulrap wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Reserve the UI bar height when scaling the game area #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions apps/scatter/src/game/stateLayout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,11 @@ export const { stateLayout, stateLayoutDerived } = createLayout({
landscape: { width: 1600, height: 900 },
portrait: { width: 800, height: 1422 },
},
// height the UI bar takes along the bottom, in mainSizesMap units
safeAreaBottomMap: {
desktop: 220,
tablet: 260,
landscape: 240,
portrait: 380,
},
});
47 changes: 31 additions & 16 deletions packages/utils-layout/src/createLayout.svelte.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ export const createLayout = (layoutOptions: {
portrait: number;
};
mainSizesMap: MainSizesMap;
/**
* Height the UI chrome occupies along the bottom, per layout type, in the same
* units as `mainSizesMap`. Reserving it keeps the game area clear of the UI bar
* when the canvas is wider than the design ratio - without it the game area
* takes the full canvas height and the bottom of the board renders behind the
* bar. Omit it and the layout is unchanged.
*/
safeAreaBottomMap?: Partial<Record<keyof MainSizesMap, number>>;
}) => {
const canvasSizes = () => ({ width: innerWidth.current ?? 1, height: innerHeight.current ?? 1 }); // because of resizeTo: window
const canvasRatio = () => getRatio(canvasSizes());
Expand All @@ -56,25 +64,32 @@ export const createLayout = (layoutOptions: {
};
const isStacked = () => ['portrait', 'almostSquare'].includes(layoutType());

const createMainLayout = (mainSizesMap: MainSizesMap) => () => {
const x = canvasSizes().width * 0.5;
const y = canvasSizes().height * 0.5;
const mainSizes = mainSizesMap[layoutType()];
const widthScale = canvasSizes().width / mainSizes.width;
const heightScale = canvasSizes().height / mainSizes.height;
const scale = Math.min(widthScale, heightScale);
const createMainLayout =
(
mainSizesMap: MainSizesMap,
safeAreaBottomMap?: Partial<Record<keyof MainSizesMap, number>>,
) =>
() => {
const mainSizes = mainSizesMap[layoutType()];
const safeAreaBottom = safeAreaBottomMap?.[layoutType()] ?? 0;
const widthScale = canvasSizes().width / mainSizes.width;
const heightScale = canvasSizes().height / (mainSizes.height + safeAreaBottom);
const scale = Math.min(widthScale, heightScale);
const x = canvasSizes().width * 0.5;
// centre in the area above the reserved strip, not in the whole canvas
const y = canvasSizes().height * 0.5 - safeAreaBottom * scale * 0.5;

return {
x,
y,
scale,
width: mainSizes.width,
height: mainSizes.height,
anchor: 0.5,
return {
x,
y,
scale,
width: mainSizes.width,
height: mainSizes.height,
anchor: 0.5,
};
};
};

const mainLayout = createMainLayout(layoutOptions.mainSizesMap);
const mainLayout = createMainLayout(layoutOptions.mainSizesMap, layoutOptions.safeAreaBottomMap);

const mainLayoutStandard = createMainLayout(STANDARD_MAIN_SIZES_MAP);

Expand Down