bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug: Fixed issue #1609 added a message popup state handler to control unwanted screen redraw

master
chiefdaft 2022-03-25 00:31:38 +01:00
parent 286ec4cb80
commit 6dbe7dfee1
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/game1024/app.js
View File

@ -144,6 +144,13 @@ const buttons = {
}, },
add: function(btn) { add: function(btn) {
this.all.push(btn); this.all.push(btn);
},
isPopUpActive: false,
activatePopUp: function() {
this.isPopUpActive = true;
},
deActivatePopUp: function() {
this.isPopUpActive = false;
} }
}; };
/** /**
@ -253,7 +260,6 @@ const dragThreshold = 10;
const clickThreshold = 3; const clickThreshold = 3;
let allSquares = []; let allSquares = [];
// let buttons = [];
class Button { class Button {
constructor(name, x0, y0, width, height, text, bg, fg, cb, enabled) { constructor(name, x0, y0, width, height, text, bg, fg, cb, enabled) {
@ -483,6 +489,7 @@ function initGame() {
Bangle.drawWidgets(); Bangle.drawWidgets();
} }
function drawPopUp(message,cb) { function drawPopUp(message,cb) {
buttons.activatePopUp();
g.setColor('#FFFFFF'); g.setColor('#FFFFFF');
let rDims = Bangle.appRect; let rDims = Bangle.appRect;
g.fillPoly([rDims.x+10, rDims.y+20, g.fillPoly([rDims.x+10, rDims.y+20,
@ -505,6 +512,7 @@ function drawPopUp(message,cb) {
g.drawString(message, rDims.x+20, rDims.y+20); g.drawString(message, rDims.x+20, rDims.y+20);
buttons.add(btnYes); buttons.add(btnYes);
buttons.add(btnNo); buttons.add(btnNo);
} }
function handlePopUpClicks(btn) { function handlePopUpClicks(btn) {
const name = btn.name; const name = btn.name;
@ -512,6 +520,7 @@ function handlePopUpClicks(btn) {
buttons.all.pop(); // remove the yes button buttons.all.pop(); // remove the yes button
buttons.all.forEach(b => {b.enable();}); // enable the remaining buttons again buttons.all.forEach(b => {b.enable();}); // enable the remaining buttons again
debug(() => console.log("Button name =", name)); debug(() => console.log("Button name =", name));
buttons.deActivatePopUp();
switch (name) { switch (name) {
case 'yes': case 'yes':
resetGame(); resetGame();
@ -568,14 +577,13 @@ function handleclick(e) {
// Handle a drag event (moving the stones around) // Handle a drag event (moving the stones around)
function handledrag(e) { function handledrag(e) {
/*debug(Math.abs(e.dx) > Math.abs(e.dy) ? // Stop moving things around when the popup message is active
(e.dx > 0 ? e => console.log('To the right') : e => console.log('To the left') ) : // Bangleapps issue #1609
(e.dy > 0 ? e => console.log('Move down') : e => console.log('Move up') )); if (!(buttons.isPopUpActive)) {
*/
// [move.right, move.left, move.up, move.down]
runGame((Math.abs(e.dx) > Math.abs(e.dy) ? runGame((Math.abs(e.dx) > Math.abs(e.dy) ?
(e.dx > 0 ? mover.direction.right : mover.direction.left ) : (e.dx > 0 ? mover.direction.right : mover.direction.left ) :
(e.dy > 0 ? mover.direction.down : mover.direction.up ))); (e.dy > 0 ? mover.direction.down : mover.direction.up )));
}
} }
// Evaluate "drag" events from the UI and call handlers for drags or clicks // Evaluate "drag" events from the UI and call handlers for drags or clicks
// The UI sends a drag as a series of events indicating partial movements // The UI sends a drag as a series of events indicating partial movements