From 9335cd3b12197e0748959616c962bd5bcfacf4be Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Thu, 10 Jan 2019 15:37:13 +1200 Subject: [PATCH] Fixed issue with mirrors --- desktop/sources/links/main.css | 2 +- desktop/sources/scripts/generator.js | 2 +- desktop/sources/scripts/renderer.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/sources/links/main.css b/desktop/sources/links/main.css index e70f773..c1e6274 100644 --- a/desktop/sources/links/main.css +++ b/desktop/sources/links/main.css @@ -8,7 +8,7 @@ body { padding: 0px; font-family: 'input_mono_regular'; -webkit-user-select: non /* Interface */ -#interface { font-size: 11px;line-height: 30px;text-transform: uppercase;-webkit-app-region: no-drag; transition: all 150ms; width: 100%; position:fixed; bottom:20px; left:35px; height:30px; max-width:calc(100vw - 80px); overflow: hidden;} +#interface { font-size: 11px;line-height: 30px;text-transform: uppercase;-webkit-app-region: no-drag; transition: all 150ms; width: 100%; position:fixed; bottom:20px; left:45px; height:30px; max-width:calc(100vw - 85px); overflow: hidden;} #interface.hidden { bottom:10px;opacity: 0 } #interface.visible { bottom:20px; opacity: 1 } #interface #menu { opacity: 1; position: absolute; top:0px; transition: all 250ms; z-index: 900; overflow: hidden; height:30px; width:100%;} diff --git a/desktop/sources/scripts/generator.js b/desktop/sources/scripts/generator.js index 410abe2..f9a6123 100644 --- a/desktop/sources/scripts/generator.js +++ b/desktop/sources/scripts/generator.js @@ -11,7 +11,7 @@ function Generator (layer, style) { const seg = l[k1] for (const k2 in seg.vertices) { if (mirror == 1 || mirror == 3) { seg.vertices[k2].x = (DOTGRID.tool.settings.size.width) - seg.vertices[k2].x + 15 } - if (mirror == 2 || mirror == 3) { seg.vertices[k2].y = (DOTGRID.tool.settings.size.height) - seg.vertices[k2].y + 30 } + if (mirror == 2 || mirror == 3) { seg.vertices[k2].y = (DOTGRID.tool.settings.size.height) - seg.vertices[k2].y + 15 } // Offset seg.vertices[k2].x += offset.x diff --git a/desktop/sources/scripts/renderer.js b/desktop/sources/scripts/renderer.js index fd0fe0b..73e7f9f 100644 --- a/desktop/sources/scripts/renderer.js +++ b/desktop/sources/scripts/renderer.js @@ -65,7 +65,7 @@ function Renderer (dotgrid) { if (dotgrid.tool.style().mirror_style === 0 && dotgrid.tool.settings.crest === false) { return } - const middle = { x: dotgrid.tool.settings.size.width + 15, y: dotgrid.tool.settings.size.height + (this.scale * 15) } + const middle = { x: dotgrid.tool.settings.size.width + 15, y: dotgrid.tool.settings.size.height + 15 } if (dotgrid.tool.style().mirror_style === 1 || dotgrid.tool.style().mirror_style === 3 || dotgrid.tool.settings.crest === true) { this.drawRule({ x: middle.x, y: 15 * this.scale }, { x: middle.x, y: (dotgrid.tool.settings.size.height + 15) * this.scale })