diff --git a/view/src/components/Editor/Editor.svelte b/view/src/components/Editor/Editor.svelte index c0d6d47..968afc6 100644 --- a/view/src/components/Editor/Editor.svelte +++ b/view/src/components/Editor/Editor.svelte @@ -29,7 +29,7 @@
- +
@@ -39,7 +39,7 @@ overflow: hidden; display: grid; height: 100%; - grid-template-columns: 75px 1fr; + grid-template-columns: 60px 1fr; grid-template-rows: 30px 1fr 30px; gap: 0px 0px; grid-template-areas: @@ -57,7 +57,7 @@ grid-area: footer; } .toolbox { - padding-top: 10px; + padding-top: 5px; grid-area: toolbox; } @@ -69,7 +69,6 @@ } .back > button { - background-color: white; border: none; width: 100%; height: 100%; diff --git a/view/src/components/Editor/Painter.svelte b/view/src/components/Editor/Painter.svelte index a012829..f551fe4 100644 --- a/view/src/components/Editor/Painter.svelte +++ b/view/src/components/Editor/Painter.svelte @@ -175,7 +175,7 @@ downOffset = xOffset; isDown = true; if (activeTool === "brush") drawBrush(); - if (activeTool === "polygon") { + if (activeTool === "smooth_polygon") { savePrePolygon(); } } @@ -237,7 +237,7 @@ cx1.globalCompositeOperation = "source-over"; } - if (activeTool === "polygon") drawPolygon(); + if (activeTool === "smooth_polygon") drawPolygon(); if (activeTool === "brush") drawBrush(); } diff --git a/view/src/components/Editor/ToolBox.svelte b/view/src/components/Editor/ToolBox.svelte index f68f25b..4d1fc32 100644 --- a/view/src/components/Editor/ToolBox.svelte +++ b/view/src/components/Editor/ToolBox.svelte @@ -1,14 +1,24 @@ {#each tools as t} {/each} @@ -20,17 +30,19 @@ } }} > - clear + diff --git a/view/src/icons/Clear.svelte b/view/src/icons/Clear.svelte new file mode 100644 index 0000000..a2fb545 --- /dev/null +++ b/view/src/icons/Clear.svelte @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/view/src/icons/Erasor.svelte b/view/src/icons/Erasor.svelte new file mode 100644 index 0000000..70c40e2 --- /dev/null +++ b/view/src/icons/Erasor.svelte @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/view/src/icons/Pan.svelte b/view/src/icons/Pan.svelte new file mode 100644 index 0000000..6da8f15 --- /dev/null +++ b/view/src/icons/Pan.svelte @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + diff --git a/view/src/icons/Plus.svelte b/view/src/icons/Plus.svelte deleted file mode 100644 index 17cf907..0000000 --- a/view/src/icons/Plus.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - - - - diff --git a/view/src/icons/Polygon.svelte b/view/src/icons/Polygon.svelte new file mode 100644 index 0000000..1a618d3 --- /dev/null +++ b/view/src/icons/Polygon.svelte @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/view/src/icons/SmoothPolygon.svelte b/view/src/icons/SmoothPolygon.svelte new file mode 100644 index 0000000..a020ed0 --- /dev/null +++ b/view/src/icons/SmoothPolygon.svelte @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/view/src/icons/index.ts b/view/src/icons/index.ts index 3e87783..8919a94 100644 --- a/view/src/icons/index.ts +++ b/view/src/icons/index.ts @@ -1,2 +1,14 @@ +export { default as Brush } from "./Brush.svelte" +export { default as Clear } from "./Clear.svelte" export { default as Cross } from "./Cross.svelte" -export { default as Plus } from "./Plus.svelte" \ No newline at end of file +export { default as Erasor } from "./Erasor.svelte" +export { default as Pan } from "./Pan.svelte" +export { default as Polygon } from "./Polygon.svelte" +export { default as SmoothPolygon } from "./SmoothPolygon.svelte" +export { default as brush } from "./Brush.svelte" +export { default as clear } from "./Clear.svelte" +export { default as cross } from "./Cross.svelte" +export { default as erasor } from "./Erasor.svelte" +export { default as pan } from "./Pan.svelte" +export { default as polygon } from "./Polygon.svelte" +export { default as smooth_polygon } from "./SmoothPolygon.svelte" \ No newline at end of file