mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

merged after pull from remote

Browse Source
This commit is contained in:
Julian Descottes 2012-08-29 20:43:07 +02:00
commit c43e25e3bf
3 changed files with 6 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
css/piskel.css
View File

@ -1,36 +0,0 @@
html, body {
height : 100%;
}
.debug {
border : 1px Solid black;
}
.left-nav {
position:absolute;
top : 0;
bottom : 0;
width : 200px;
background : #000;
}
.main-panel {
position:absolute;
top : 0;
bottom : 0;
left : 200px;
right : 0;
background : #ccc;
}
.preview-container {
position : absolute;
top : 30px;
right : 0;
height : 200px;
width : 200px;
background : white;
border : 0px Solid black;
border-radius:5px 0px 0px 5px;
box-shadow : 0px 0px 2px rgba(0,0,0,0.2);
}

2
js/frameSheetModel.js
View File

@ -1,4 +1,3 @@
var FrameSheetModel = (function() { var FrameSheetModel = (function() {
var inst; var inst;
@ -18,6 +17,7 @@ var FrameSheetModel = (function() {
validate: function() { validate: function() {
return true; // I'm always right dude return true; // I'm always right dude
}, },
getAllPixels : function () { getAllPixels : function () {
var pixels = []; var pixels = [];
for (var i = 0 ; i < frames.length ; i++) { for (var i = 0 ; i < frames.length ; i++) {

6
js/piskel.js
View File

@ -3,7 +3,6 @@
// Constants: // Constants:
TRANSPARENT_COLOR = 'tc', TRANSPARENT_COLOR = 'tc',
//TRANSPARENT_COLOR = 'pink',
DEFAULT_PEN_COLOR = '#000000', DEFAULT_PEN_COLOR = '#000000',
// Configuration: // Configuration:
@ -115,6 +114,7 @@
drawingAreaContainer.setAttribute('style', drawingAreaContainer.setAttribute('style',
'width:' + framePixelWidth * drawingCanvasDpi + 'px; height:' + framePixelHeight * drawingCanvasDpi + 'px;'); 'width:' + framePixelWidth * drawingCanvasDpi + 'px; height:' + framePixelHeight * drawingCanvasDpi + 'px;');
drawingAreaCanvas.setAttribute('oncontextmenu', 'piskel.onCanvasContextMenu(event)'); drawingAreaCanvas.setAttribute('oncontextmenu', 'piskel.onCanvasContextMenu(event)');
drawingAreaContainer.appendChild(drawingAreaCanvas); drawingAreaContainer.appendChild(drawingAreaCanvas);
@ -122,7 +122,6 @@
body.setAttribute('onmouseup', 'piskel.onCanvasMouseup(event)'); body.setAttribute('onmouseup', 'piskel.onCanvasMouseup(event)');
drawingAreaContainer.setAttribute('onmousedown', 'piskel.onCanvasMousedown(event)'); drawingAreaContainer.setAttribute('onmousedown', 'piskel.onCanvasMousedown(event)');
drawingAreaContainer.setAttribute('onmousemove', 'piskel.onCanvasMousemove(event)'); drawingAreaContainer.setAttribute('onmousemove', 'piskel.onCanvasMousemove(event)');
this.drawFrameToCanvas(frameSheet.getFrameByIndex(this.getActiveFrameIndex()), drawingAreaCanvas, drawingCanvasDpi); this.drawFrameToCanvas(frameSheet.getFrameByIndex(this.getActiveFrameIndex()), drawingAreaCanvas, drawingCanvasDpi);
}, },
@ -174,6 +173,7 @@
} }
$("display-fps").innerHTML = animPreviewFPS + " fps"; $("display-fps").innerHTML = animPreviewFPS + " fps";
animFPSTuner.value = animPreviewFPS; animFPSTuner.value = animPreviewFPS;
$("fps-value").innerHTML = animPreviewFPS + " fps";
refreshUpdater = startPreviewRefresh(); refreshUpdater = startPreviewRefresh();
}); });
}, },
@ -357,6 +357,7 @@
event.cancelBubble = true; event.cancelBubble = true;
return false; return false;
}, },
onPaletteClick : function (event) { onPaletteClick : function (event) {
var color = event.target.getAttribute("data-color"); var color = event.target.getAttribute("data-color");
if (null !== color) { if (null !== color) {
@ -379,3 +380,4 @@
piskel.init(); piskel.init();
})(function(id){return document.getElementById(id)}); })(function(id){return document.getElementById(id)});
//small change for checking my git setup :(