c_meyer/pxt-ev3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing button down issues on touch/mouse (#294)

Browse Source
This commit is contained in:
Peli de Halleux 2018-01-31 14:21:17 -08:00 committed by GitHub
parent 635d4a7624
commit a0907e7229
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -45,7 +45,7 @@
},
"dependencies": {
"pxt-common-packages": "0.17.13",
"pxt-core": "3.1.1"
"pxt-core": "3.1.2"
},
"scripts": {
"test": "node node_modules/pxt-core/built/pxt.js travis"

6
sim/visuals/board.ts
View File

@ -15,6 +15,12 @@ namespace pxsim.visuals {
-webkit-filter: grayscale(1);
filter: grayscale(1);
}
.user-select-none, .sim-button {
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.sim-button {
cursor: pointer;
}

8
sim/visuals/controls/colorGrid.ts
View File

@ -19,18 +19,18 @@ namespace pxsim.visuals {
if (c % 2 == 0) cy += 5;
if (colorIds[c]) {
const circle = pxsim.svg.child(this.group, "circle", { 'class': 'sim-color-grid-circle', 'cx': cx, 'cy': cy, 'r': '2', 'style': `fill: ${colors[c]}` });
circle.addEventListener(pointerEvents.down, ev => {
pointerEvents.down.forEach(evid => circle.addEventListener(evid, ev => {
this.setColor(colorValue[c]);
})
}));
}
}
const whiteCircleWrapper = pxsim.svg.child(this.group, "g", { 'id': 'white-cirlce-wrapper' });
pxsim.svg.child(whiteCircleWrapper, "circle", { 'class': 'sim-color-grid-circle', 'cx': 2.2, 'cy': '11', 'r': '2', 'style': `fill: #fff` });
pxsim.svg.child(whiteCircleWrapper, "circle", { 'cx': 2.2, 'cy': '11', 'r': '2', 'style': `fill: none;stroke: #94989b;stroke-width: 0.1px` });
whiteCircleWrapper.addEventListener(pointerEvents.down, ev => {
pointerEvents.down.forEach(evid => whiteCircleWrapper.addEventListener(evid, ev => {
this.setColor(6);
})
}));
return this.group;
}

4
sim/visuals/nodes/brickView.ts
View File

@ -174,10 +174,10 @@ namespace pxsim.visuals {
this.buttons.forEach((btn, index) => {
let button = stateButtons[index];
btn.addEventListener(pointerEvents.down, ev => {
pointerEvents.down.forEach(evid => btn.addEventListener(evid, ev => {
button.setPressed(true);
svg.fill(this.buttons[index], this.theme.buttonDown);
})
}));
btn.addEventListener(pointerEvents.leave, ev => {
button.setPressed(false);
svg.fill(this.buttons[index], this.theme.buttonUps[index]);

4
sim/visuals/nodes/touchSensorView.ts
View File

@ -38,10 +38,10 @@ namespace pxsim.visuals {
this.content.style.cursor = "pointer";
const btn = this.content;
const state = ev3board().getSensor(this.port, DAL.DEVICE_TYPE_TOUCH) as TouchSensorNode;
btn.addEventListener(pointerEvents.down, ev => {
pointerEvents.down.forEach(evid => btn.addEventListener(evid, ev => {
this.setPressed(true);
state.setPressed(true);
})
}))
btn.addEventListener(pointerEvents.leave, ev => {
this.setPressed(false);
state.setPressed(false);