diff --git a/main.js b/main.js index a328d77..5fa3f2c 100644 --- a/main.js +++ b/main.js @@ -7,7 +7,7 @@ let win app.on('ready', () => { - win = new BrowserWindow({width: 930, height: 540, frame:false, backgroundColor: '#000', show:false, resizable:true, transparent: true, autoHideMenuBar: true, icon: __dirname + '/icon.ico'}) + win = new BrowserWindow({width: 930, height: 540, frame:false,autoHideMenuBar: true, backgroundColor: '#000', show:false, resizable:true, icon: __dirname + '/icon.ico'}) var nativeHandleBuffer = win.getNativeWindowHandle(); diff --git a/sources/links/main.css b/sources/links/main.css index 3c6264c..1f1ae1e 100644 --- a/sources/links/main.css +++ b/sources/links/main.css @@ -6,8 +6,8 @@ canvas { cursor: none } yu { display:block; } #cursor { z-index:899; position: fixed; } -#guide { z-index:810;position: fixed; } -#preview { z-index:805; position: fixed; } +#guide { z-index:810;position: fixed; display: none} +#preview { z-index:805; position: fixed; display: none} #above { z-index:800; position: fixed; } #below { z-index:799; position: fixed; } #grid { z-index:795;position: fixed; display: none} diff --git a/sources/scripts/core/layer.js b/sources/scripts/core/layer.js index 975442f..a2e6c29 100644 --- a/sources/scripts/core/layer.js +++ b/sources/scripts/core/layer.js @@ -12,10 +12,11 @@ function Layer(name) this.update = function(zoom = {scale:1,offset:{x:0,y:0}}) { + console.log(`Updated ${this.name}`); this.el.style.width = (ronin.frame.width * ronin.frame.zoom.scale)+"px"; this.el.style.height = (ronin.frame.height * ronin.frame.zoom.scale)+"px"; - this.el.style.left = `calc(50vw - ${ronin.frame.width/2}px + ${zoom.offset.x}px)`; - this.el.style.top = `calc(50vh - ${ronin.frame.height/2}px + ${zoom.offset.y}px)`; + this.el.style.left = zoom.offset.x+"px"; + this.el.style.top = zoom.offset.y+"px"; } this.context = function() @@ -25,6 +26,7 @@ function Layer(name) this.resize_to = function(size) { + console.log(`Resized ${this.name}`); this.el.width = ronin.frame.width * 2; this.el.height = ronin.frame.height * 2; this.update(); diff --git a/sources/scripts/modules/frame.js b/sources/scripts/modules/frame.js index 9576df7..e9f1f38 100644 --- a/sources/scripts/modules/frame.js +++ b/sources/scripts/modules/frame.js @@ -59,7 +59,8 @@ function Frame() const {dialog,app} = require('electron').remote; var win = require('electron').remote.getCurrentWindow(); win.setSize(size.width,size.height); - ronin.cursor.target.resize_to(size); + ronin.layers.above.resize_to(size); + ronin.layers.below.resize_to(size); ronin.grid.resize_to(size); ronin.guide.resize_to(size); ronin.cursor.resize_to(size); diff --git a/sources/scripts/ronin.js b/sources/scripts/ronin.js index 4aa777a..f19c96d 100644 --- a/sources/scripts/ronin.js +++ b/sources/scripts/ronin.js @@ -85,6 +85,8 @@ function Ronin() this.preview.update(); this.commander.update(); + this.frame.resize_to({width:930,height:540}); + this.load(); }