diff --git a/src/game-loop/game-presentation.ts b/src/game-loop/game-presentation.ts index 5683b2a..65ace6e 100644 --- a/src/game-loop/game-presentation.ts +++ b/src/game-loop/game-presentation.ts @@ -12,7 +12,7 @@ for (let i = 0; i < 100; i++) { } const colors = hues.map((hue) => - hsl(hue, Random.randomBetween(80, 90), Random.randomBetween(20, 30)) + hsl(hue, Random.randomBetween(90, 100), Random.randomBetween(20, 30)) ); export class GamePresentation { diff --git a/src/index.scss b/src/index.scss index a148eb5..64d481f 100644 --- a/src/index.scss +++ b/src/index.scss @@ -260,6 +260,7 @@ html { .slider { $track-height: 12px; margin-bottom: var(--small-margin); + user-select: none; p { display: flex; diff --git a/src/index.ts b/src/index.ts index 9a05826..b76fb2d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -79,7 +79,13 @@ const main = async () => { infoPageHandler.onOpen = settingsPageHandler.close.bind(settingsPageHandler); infoPageHandler.open(); - new MenuHider(elements.aside, FullScreenHandler.isInFullScreenMode); + new MenuHider( + elements.aside, + () => + FullScreenHandler.isInFullScreenMode() && + !settingsPageHandler.isOpen && + !infoPageHandler.isOpen + ); new FullScreenHandler( elements.minimizeFullScreenButton, elements.maximizeFullScreenButton, diff --git a/src/page/collapsible-panel-animator.ts b/src/page/collapsible-panel-animator.ts index d685769..d4c91fa 100644 --- a/src/page/collapsible-panel-animator.ts +++ b/src/page/collapsible-panel-animator.ts @@ -1,5 +1,5 @@ export class CollapsiblePanelAnimator { - private isOpen = false; + private _isOpen = false; public onOpen: () => unknown = () => {}; public onClose: () => unknown = () => {}; @@ -17,24 +17,28 @@ export class CollapsiblePanelAnimator { } public open() { - this.isOpen = true; + this._isOpen = true; this.collapsibleContent.classList.remove('hidden'); this.toggleButton.classList.add('active'); this.onOpen(); } public close() { - this.isOpen = false; + this._isOpen = false; this.collapsibleContent.classList.add('hidden'); this.toggleButton.classList.remove('active'); this.onClose(); } public toggle() { - if (this.isOpen) { + if (this._isOpen) { this.close(); } else { this.open(); } } + + public get isOpen() { + return this._isOpen; + } }