diff --git a/1 - Blockcode/resources/css/base.css b/1 - Blockcode/resources/css/base.css index 2728d36..8e3ccca 100644 --- a/1 - Blockcode/resources/css/base.css +++ b/1 - Blockcode/resources/css/base.css @@ -9,10 +9,8 @@ div { padding: 0.5em; } #header { max-height: 4em; } #menu { background-color: #FFDAB9; height: -webkit-fill-available; } #script { background-color: #B0C4DE; height: -webkit-fill-available; } -#menu > .script-block { background-color: #FF7F4F !important; } -#script > .script-block, -.script-nest > .script-block { background-color: #1E90FF !important; } -#script .script-nest { background-color: #B0C4DE !important; } +#menu > .script-block { background-color: #FF7F4F !important; } +#script .script-nest { background-color: #B0C4DE !important; } .flex-parent { display: flex; @@ -41,4 +39,5 @@ div { padding: 0.5em; } padding: 0.5em; } -.script-nest { background-color: #FFDAB9; } +.script-block { background-color: #1E90FF !important; } +.script-nest { background-color: #FFDAB9; } diff --git a/1 - Blockcode/resources/js/canvas-controller.js b/1 - Blockcode/resources/js/canvas-controller.js index 1ce907e..47566bb 100644 --- a/1 - Blockcode/resources/js/canvas-controller.js +++ b/1 - Blockcode/resources/js/canvas-controller.js @@ -4,8 +4,7 @@ const resetCanvasState = () => { clearCanvas(); } -const resetRotation = () => { Painter.rotation = 0; } -const clearCanvas = () => { Painter.canvasContext.clearRect(0, 0, canvas.width, canvas.height); } +const resetRotation = () => { Painter.rotation = ROTATION; } const resetCanvasBrush = () => { setDefaultBrushSize(); @@ -13,6 +12,11 @@ const resetCanvasBrush = () => { setBrushToCenter(); } +const clearCanvas = () => { + Painter.canvasContext.clearRect(0, 0, canvas.width, canvas.height); + Painter.canvasContext.beginPath(); +} + const setDefaultBrushSize = () => { Painter.brushSize = BRUSH_SIZE; Painter.canvasContext.lineWidth = BRUSH_SIZE; diff --git a/1 - Blockcode/resources/js/events.js b/1 - Blockcode/resources/js/events.js index 78a2bd3..483b858 100644 --- a/1 - Blockcode/resources/js/events.js +++ b/1 - Blockcode/resources/js/events.js @@ -34,7 +34,7 @@ window.onload = (eve) => { clearBttn.onclick = (eve) => { clearScriptNode(); - clearCanvas(); + resetCanvasState(); } saveBttn.onclick = (eve) => { saveScript(); } diff --git a/1 - Blockcode/resources/js/globals.js b/1 - Blockcode/resources/js/globals.js index 7690928..7fb749f 100644 --- a/1 - Blockcode/resources/js/globals.js +++ b/1 - Blockcode/resources/js/globals.js @@ -14,13 +14,14 @@ const ScriptElms = { const BRUSH_SIZE = 2; const BRUSH_COLOR = "#000000"; +const ROTATION = 0; let Painter = { canvas: null, canvasContext: null, brushSize: BRUSH_SIZE, brushColor: BRUSH_COLOR, - rotation: 0, + rotation: ROTATION, x1: 0, y1: 0, isBrushLifted: false