diff --git a/media/filter.color.jpg b/media/filter.color.jpg deleted file mode 100644 index eb15803..0000000 Binary files a/media/filter.color.jpg and /dev/null differ diff --git a/media/filter.mono.jpg b/media/filter.mono.jpg deleted file mode 100644 index 9eece7d..0000000 Binary files a/media/filter.mono.jpg and /dev/null differ diff --git a/media/icon_128.png b/media/icon_128.png deleted file mode 100644 index 6cfd7fe..0000000 Binary files a/media/icon_128.png and /dev/null differ diff --git a/media/icon_16.png b/media/icon_16.png deleted file mode 100644 index aed5233..0000000 Binary files a/media/icon_16.png and /dev/null differ diff --git a/scripts/core/init.js b/scripts/core/init.js index fc15fed..c6c67bf 100644 --- a/scripts/core/init.js +++ b/scripts/core/init.js @@ -13,6 +13,7 @@ document.addEventListener('mousedown', function(e){ ronin.cursor.mouse_down(roni document.addEventListener('mousemove', function(e){ ronin.cursor.mouse_move(ronin.position_in_canvas(e));}, false); document.addEventListener('mouseup', function(e){ ronin.cursor.mouse_up(ronin.position_in_canvas(e));}, false); // document.addEventListener('contextmenu', function(ev){ ev.preventDefault(); return false;}, false); +window.addEventListener('resize', function(){ ronin.on_resize(); }, true); // Keyboard diff --git a/scripts/core/ronin.js b/scripts/core/ronin.js index c70fff5..35cd75b 100644 --- a/scripts/core/ronin.js +++ b/scripts/core/ronin.js @@ -43,7 +43,7 @@ function Ronin() x -= parseInt(this.surface.element.style.marginLeft) + (this.surface.size.width/2); var y = e.clientY; y -= (window.innerHeight - this.surface.size.height)/2; - y -= parseInt(this.surface.element.style.marginTop) + (this.surface.size.height/2); + y -= parseInt(this.surface.element.style.marginTop) + parseInt(this.surface.size.height/2); return new Position(x,y); } @@ -58,4 +58,9 @@ function Ronin() var date = currentdate.getFullYear()+""+(currentdate.getMonth()+1)+""+currentdate.getDate(); return date+" "+currentdate.getHours()+":"+currentdate.getMinutes()+":"+currentdate.getSeconds(); } + + this.on_resize = function() + { + this.widget.on_resize(); + } } \ No newline at end of file diff --git a/scripts/core/widget.js b/scripts/core/widget.js index c4d0004..e01c271 100644 --- a/scripts/core/widget.js +++ b/scripts/core/widget.js @@ -14,4 +14,13 @@ function Widget() this.element.innerHTML = s; } + + this.on_resize = function() + { + this.element.style.left = (window.innerWidth/2)-(ronin.surface.size.width/2); + this.element.style.top = (window.innerHeight/2)+(ronin.surface.size.height/2); + this.element.style.width = ronin.surface.size.width+"px"; + + this.update(); + } } \ No newline at end of file diff --git a/scripts/modules/surface.js b/scripts/modules/surface.js index decefb8..8ef2661 100644 --- a/scripts/modules/surface.js +++ b/scripts/modules/surface.js @@ -68,15 +68,12 @@ function Surface(rune) ronin.surface.element.width = rect.width * 2; ronin.surface.element.height = rect.height * 2; - ronin.surface.element.style.marginLeft = -(rect.width/2); - ronin.surface.element.style.marginTop = -(rect.height/2); ronin.surface.element.style.width = rect.width+"px"; ronin.surface.element.style.height = rect.height+"px"; - ronin.widget.element.style.left = (window.innerWidth/2)-(rect.width/2); - ronin.widget.element.style.top = (window.innerHeight/2)+(rect.height/2); - ronin.widget.element.style.width = rect.width+"px"; - - ronin.widget.update(); + ronin.surface.element.style.marginLeft = -(rect.width/2); + ronin.surface.element.style.marginTop = -(rect.height/2); + + ronin.on_resize(); } this.widget = function() diff --git a/scripts/units/position.js b/scripts/units/position.js index 5523291..4203e78 100644 --- a/scripts/units/position.js +++ b/scripts/units/position.js @@ -5,8 +5,8 @@ function Position(position_str = "0,0",y = null) this.example = "100,150"; this.position_str = position_str; - this.x = y ? position_str : parseFloat(this.position_str.split(",")[0]); - this.y = y ? y : parseFloat(this.position_str.split(",")[1]); + this.x = y != null ? position_str : parseFloat(this.position_str.split(",")[0]); + this.y = y != null ? y : parseFloat(this.position_str.split(",")[1]); this.add = function(position) {