Skip to content

Auto Canvas Height + Width #9

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
dumax315 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Auto Canvas Height + Width #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dab6c07
got rid of footer (there's already a back button at the top)
dumax315 Jan 31, 2025
78e2927
feat: automatic canvas resizing
dumax315 Jan 31, 2025
eb58891
feat: removed set canvas height button/input
dumax315 Jan 31, 2025
4ab6d71
chore: algoScreen.css formating
dumax315 Jan 31, 2025
a0fa8fa
style: only scroll mainContainer on x overflow
dumax315 Feb 1, 2025
dd7f777
fix: during x overflow the canvas exapnds with the buttons
dumax315 Feb 1, 2025
3fb8834
style: switch from 100% to svh to attmpt to mitigate vertical scroll …
dumax315 Feb 1, 2025
cf9abcb
fix: ensures bottom controls height is incorperated into updateDimens…
dumax315 Feb 4, 2025
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
92 changes: 2 additions & 90 deletions src/anim/AnimationMain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,54 +84,6 @@ function setCookie(cookieName, value, expireDays) {

const ANIMATION_SPEED_DEFAULT = 75;

// TODO: Move these out of global space into animation manager?

function controlKey(keyASCII) {
return (
keyASCII === 8 ||
keyASCII === 9 ||
keyASCII === 37 ||
keyASCII === 38 ||
keyASCII === 39 ||
keyASCII === 40 ||
keyASCII === 46
);
}

function returnSubmit(field, func, maxSize, intOnly) {
if (maxSize !== undefined) {
field.size = maxSize;
}
return function (event) {
let keyASCII = 0;
if (window.event) {
// IE
keyASCII = event.keyCode;
} else if (event.which) {
// Netscape/Firefox/Opera
keyASCII = event.which;
}

if (keyASCII === 13) {
func();
return false;
} else if (
keyASCII === 59 ||
keyASCII === 45 ||
keyASCII === 46 ||
keyASCII === 190 ||
keyASCII === 173
) {
return false;
} else if (
(maxSize !== undefined && field.value.length >= maxSize) ||
(intOnly && (keyASCII < 48 || keyASCII > 57))
) {
if (!controlKey(keyASCII)) return false;
}
return true;
};
}

function addControlToAnimationBar(animBarRef, type, name, callback) {
const element = document.createElement('input');
Expand Down Expand Up @@ -272,7 +224,7 @@ export default class AnimationManager extends EventListener {
/>
);

let tableEntry = document.createElement('td');
const tableEntry = document.createElement('td');

const controlBar = document.getElementById('GeneralAnimationControls');

Expand All @@ -291,7 +243,7 @@ export default class AnimationManager extends EventListener {
midLevel = document.createElement('tr');
bottomLevel = document.createElement('td');
bottomLevel.align = 'center';
let txtNode = document.createTextNode('Animation Speed');
const txtNode = document.createTextNode('Animation Speed');
midLevel.appendChild(bottomLevel);
bottomLevel.classList.add('txt-node');
bottomLevel.appendChild(txtNode);
Expand All @@ -306,47 +258,10 @@ export default class AnimationManager extends EventListener {

element.setAttribute('style', 'width:200px');

addDivisorToAnimationBar(animBarRef);

let width = getCookie('VisualizationWidth');
width = width == null || width === '' ? 1500 : parseInt(width);

let height = getCookie('VisualizationHeight');
height = height == null || height === '' ? 555 : parseInt(height);

canvas.width = width;
canvas.height = height;

tableEntry = document.createElement('td');
txtNode = document.createTextNode('Canvas height:');
tableEntry.classList.add('txt-node');
tableEntry.appendChild(txtNode);
controlBar.appendChild(tableEntry);

this.heightEntry = addControlToAnimationBar(animBarRef, 'Text', canvas.height, () =>
returnSubmit(
this.heightEntry,
() =>
this.changeSize(
document.documentElement.clientWidth,
parseInt(this.heightEntry.value),
),
4,
true,
),
);

this.heightEntry.size = 4;
this.sizeButton = addControlToAnimationBar(animBarRef, 'Button', 'Change Canvas Size', () =>
this.changeSize(),
);

this.addListener('AnimationStarted', this, this.animStarted);
this.addListener('AnimationEnded', this, this.animEnded);
this.addListener('AnimationWaiting', this, this.animWaiting);
this.addListener('AnimationUndoUnavailable', this, this.animUndoUnavailable);
this.objectManager.width = canvas.width;
this.objectManager.height = canvas.height;
}

lerp(from, to, percent) {
Expand Down Expand Up @@ -393,14 +308,11 @@ export default class AnimationManager extends EventListener {
if (width > 100) {
canvas.width = width;
this.animatedObjects.width = width;
setCookie('VisualizationWidth', String(width), 30);
}
if (height > 100) {
canvas.height = height;
this.animatedObjects.height = height;
setCookie('VisualizationHeight', String(height), 30);
}
this.heightEntry.value = canvas.height;

this.animatedObjects.draw();
this.fireEvent('CanvasSizeChanged', { width: canvas.width, height: canvas.height });
Expand Down
16 changes: 16 additions & 0 deletions src/css/AlgoScreen.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,26 @@
/* padding: 0 20px; /* remember that padding is the space inside the div box and margin is the space outside the div box */
background: #ffffff;
font-family: 'Roboto', Helvetica Neue, Helvetica, Arial, sans-serif;
display: flex;
flex-direction: column;
height: 100%;
min-width: 100%;
width: min-content;
}

div#x-ScrollContainer {
flex: 1;
overflow-x: auto;
}

.VisualizationMainPage #container {
background: #ffffff;
/* margin: 0 auto; /* the auto margins (in conjunction with a width) center the page */
text-align: left; /* this overrides the text-align: center on the body element. */
height: 100%;
height: 100svh; /* keeps the page full height like an app*/
display: flex;
flex-flow: column;
}

.VisualizationMainPage #toggle {
Expand Down Expand Up @@ -79,12 +93,14 @@

.VisualizationMainPage .viewport {
position: relative;
flex: 1; /* to grow and take up available space */
}

.VisualizationMainPage #generalAnimationControlSection {
background: var(--control);
border-top: 2px var(--border) solid;
transition: all 0.4s ease 0s;
min-height: 70px;
}

.VisualizationMainPage #GeneralAnimationControls {
Expand Down
139 changes: 70 additions & 69 deletions src/screens/AlgoScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,17 @@ const AlgoScreen = ({ theme, toggleTheme }) => {
}

const updateDimensions = () => {
animManagRef.current.changeSize(document.body.clientWidth);
canvasRef.current.height = 100;
canvasRef.current.width = 50;
animManagRef.current.changeSize(document.getElementById("canvasContainer").clientWidth - 1, document.getElementById("canvasContainer").clientHeight -1);
};


window.addEventListener('resize', updateDimensions);

// TODO: invistagate why 0 ms causes extra 3 pixels to be added to height
setTimeout(updateDimensions,10)

return () => {
window.removeEventListener('resize', updateDimensions);
};
Expand Down Expand Up @@ -136,81 +142,76 @@ const AlgoScreen = ({ theme, toggleTheme }) => {
</div>
</h1>
</div>
<div id="x-ScrollContainer">
<div id="mainContent">
<div id="algoControlSection">
<table id="AlgorithmSpecificControls"></table>
<div id="toggles">
{hasPseudoCode && pseudocodeType === 'none' && (
<BsFileEarmarkFill
className="pseudocode-toggle"
size={32}
onClick={togglePseudocode}
opacity={'40%'}
title="Code: Hidden"
/>
)}
{hasPseudoCode && pseudocodeType === 'english' && (
<BsFileEarmarkFontFill
className="pseudocode-toggle"
size={32}
onClick={togglePseudocode}
title="Code: English"
/>
)}
{hasPseudoCode && pseudocodeType === 'code' && (
<BsFileEarmarkCodeFill
className="pseudocode-toggle"
size={32}
onClick={togglePseudocode}
title="Code: Pseudo"
/>
)}
{bigOModals(algoName) && (
<BsClock
className="menu-modal"
size={30}
onClick={toggleBigO}
opacity={bigOEnabled ? '100%' : '40%'}
title="Time Complexities"
/>
)}
{infoModals[algoName] && (
<BsBookHalf
className="menu-modal"
size={30}
onClick={toggleMoreInfo}
opacity={moreInfoEnabled ? '100%' : '40%'}
title="More Information"
/>
)}
</div>
</div>

<div id="mainContent">
<div id="algoControlSection">
<table id="AlgorithmSpecificControls"></table>
<div id="toggles">
{hasPseudoCode && pseudocodeType === 'none' && (
<BsFileEarmarkFill
className="pseudocode-toggle"
size={32}
onClick={togglePseudocode}
opacity={'40%'}
title="Code: Hidden"
/>
)}
{hasPseudoCode && pseudocodeType === 'english' && (
<BsFileEarmarkFontFill
className="pseudocode-toggle"
size={32}
onClick={togglePseudocode}
title="Code: English"
/>
<div className="viewport" id="canvasContainer">
<canvas id="canvas" width={0} height="200" ref={canvasRef}></canvas>
{moreInfoEnabled && (
<div className="modal">
<div className="modal-content">{infoModals[algoName]}</div>
</div>
)}
{hasPseudoCode && pseudocodeType === 'code' && (
<BsFileEarmarkCodeFill
className="pseudocode-toggle"
size={32}
onClick={togglePseudocode}
title="Code: Pseudo"
/>
)}
{bigOModals(algoName) && (
<BsClock
className="menu-modal"
size={30}
onClick={toggleBigO}
opacity={bigOEnabled ? '100%' : '40%'}
title="Time Complexities"
/>
)}
{infoModals[algoName] && (
<BsBookHalf
className="menu-modal"
size={30}
onClick={toggleMoreInfo}
opacity={moreInfoEnabled ? '100%' : '40%'}
title="More Information"
/>
{bigOEnabled && (
<div className="modal bigo">
<div className="modal-content">{bigOModals(algoName)}</div>
</div>
)}
</div>
</div>

<div className="viewport">
<canvas id="canvas" width={0} height="505" ref={canvasRef}></canvas>
{moreInfoEnabled && (
<div className="modal">
<div className="modal-content">{infoModals[algoName]}</div>
</div>
)}
{bigOEnabled && (
<div className="modal bigo">
<div className="modal-content">{bigOModals(algoName)}</div>
</div>
)}
</div>

<div id="generalAnimationControlSection">
<table id="GeneralAnimationControls" ref={animBarRef}></table>
<div id="generalAnimationControlSection">
<table id="GeneralAnimationControls" ref={animBarRef}></table>
</div>
</div>
</div>

<div id="footer">
<p>
<Link to="/">Return to Home Page</Link>
</p>
</div>
</div>
</div>
);
Expand Down