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

added shortcuts to select previous / next color in palette

Browse Source
This commit is contained in:
juliandescottes
2014-09-27 11:04:03 +02:00
parent 37aa6c3d72
commit fe5e8966a5
9 changed files with 84 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/utils/FrameUtils.js
View File

@@ -83,9 +83,9 @@
* @param {String} strColor2 color under
* @return {String} the composite color
*/
mergePixels_ : function (strColor1, strColor2, globalOpacity1) {
var col1 = pskl.utils.FrameUtils.toRgba_(strColor1);
var col2 = pskl.utils.FrameUtils.toRgba_(strColor2);
mergePixels__ : function (strColor1, strColor2, globalOpacity1) {
var col1 = pskl.utils.FrameUtils.toRgba__(strColor1);
var col2 = pskl.utils.FrameUtils.toRgba__(strColor2);
if (typeof globalOpacity1 == 'number') {
col1 = JSON.parse(JSON.stringify(col1));
col1.a = globalOpacity1 * col1.a;
@@ -105,7 +105,7 @@
* @param {String} c color as a string
* @return {Object} {r:Number,g:Number,b:Number,a:Number}
*/
toRgba_ : function (c) {
toRgba__ : function (c) {
if (colorCache[c]) {
return colorCache[c];
}