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

Stylistic changes to pixel and pen size code.

Browse Source
This commit is contained in:
Smie
2016-11-28 08:21:30 -07:00
parent a65eeee2e0
commit da0e8dec84
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/css/pensize.css
View File

@@ -16,17 +16,17 @@
} }
.pen-size-option[data-size='1'] { .pen-size-option[data-size='1'] {
padding: 6px;
}
.pen-size-option[data-size='2'] {
padding: 5px; padding: 5px;
} }
.pen-size-option[data-size='3'] { .pen-size-option[data-size='2'] {
padding: 4px; padding: 4px;
} }
.pen-size-option[data-size='4'] { .pen-size-option[data-size='3'] {
padding: 3px; padding: 3px;
} }
.pen-size-option[data-size='4'] {
padding: 2px;
}
.pen-size-option:before { .pen-size-option:before {
content: ''; content: '';
@@ -34,6 +34,9 @@
height: 100%; height: 100%;
background-color: white; background-color: white;
display: block; display: block;
text-align: center;
line-height: 12px;
font-size: 90%;
} }
.pen-size-option:hover { .pen-size-option:hover {

6
src/js/utils/PixelUtils.js
View File

@@ -81,11 +81,9 @@
*/ */
resizePixel : function (col, row, size) { resizePixel : function (col, row, size) {
var pixels = []; var pixels = [];
var i;
var j;
for (j = 0; j < size; j++) { for (var j = 0; j < size; j++) {
for (i = 0; i < size; i++) { for (var i = 0; i < size; i++) {
pixels.push([col - Math.floor(size / 2) + i, row - Math.floor(size / 2) + j]); pixels.push([col - Math.floor(size / 2) + i, row - Math.floor(size / 2) + j]);
} }
} }

2
src/templates/drawing-tools.html
View File

@@ -5,7 +5,7 @@
<div class="pen-size-option" data-size="1"></div> <div class="pen-size-option" data-size="1"></div>
<div class="pen-size-option" data-size="2"></div> <div class="pen-size-option" data-size="2"></div>
<div class="pen-size-option" data-size="3"></div> <div class="pen-size-option" data-size="3"></div>
<div class="pen-size-option" data-size="4" real-pen-size="6"></div> <div class="pen-size-option" data-size="4"></div>
</div> </div>
<ul id="tools-container" class="tools-wrapper"> <ul id="tools-container" class="tools-wrapper">
<!-- Drawing tools will be inserted here --> <!-- Drawing tools will be inserted here -->

4
test/js/service/pensize/PenSizeServiceTest.js
View File

@@ -51,11 +51,11 @@ describe("PenSize test suite", function() {
}); });
it("skips invalid value (outside of [1, 4])", function() { it("skips invalid value (outside of [1, 4])", function() {
console.log('[PenSizeService] skips invalid value (outside of [1, 4])'); console.log('[PenSizeService] skips invalid value (outside of [1, 32])');
userSettingsPenSize = 1; userSettingsPenSize = 1;
penSizeService.init(); penSizeService.init();
// MAX_VALUE is 4 // MAX_VALUE is 32
penSizeService.setPenSize(33); penSizeService.setPenSize(33);
expect(penSizeService.getPenSize()).toBe(1); expect(penSizeService.getPenSize()).toBe(1);
// MIN_VALUE is 1 // MIN_VALUE is 1