From 0cdedd02b484c457e7a52396c567b62f38fc1b55 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 9 Jun 2016 21:14:33 -0700 Subject: [PATCH] updated rendering of buttons --- sim/simsvg.ts | 12 +++++++----- win10/app/package.appxmanifest | 9 ++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sim/simsvg.ts b/sim/simsvg.ts index eaa335f7..863ab7c8 100644 --- a/sim/simsvg.ts +++ b/sim/simsvg.ts @@ -578,11 +578,13 @@ svg.sim.grayscale { const btnw = 56.2; const btnn = 6; const btnnm = 10 - this.buttonsOuter.push(svg.child(this.g, "rect", { class: "sim-button-outer", x: left, y: top, rx: btnr, ry: btnr, width: btnw, height: btnw })); - svg.child(this.g, "circle", { class: "sim-button-nut", cx: left + btnnm, cy: top + btnnm, r: btnn }); - svg.child(this.g, "circle", { class: "sim-button-nut", cx: left + btnnm, cy: top + btnw - btnnm, r: btnn }); - svg.child(this.g, "circle", { class: "sim-button-nut", cx: left + btnw - btnnm, cy: top + btnw - btnnm, r: btnn }); - svg.child(this.g, "circle", { class: "sim-button-nut", cx: left + btnw - btnnm, cy: top + btnnm, r: btnn }); + let btng = svg.child(this.g, "g"); + this.buttonsOuter.push(btng); + svg.child(btng, "rect", { class: "sim-button-outer", x: left, y: top, rx: btnr, ry: btnr, width: btnw, height: btnw }); + svg.child(btng, "circle", { class: "sim-button-nut", cx: left + btnnm, cy: top + btnnm, r: btnn }); + svg.child(btng, "circle", { class: "sim-button-nut", cx: left + btnnm, cy: top + btnw - btnnm, r: btnn }); + svg.child(btng, "circle", { class: "sim-button-nut", cx: left + btnw - btnnm, cy: top + btnw - btnnm, r: btnn }); + svg.child(btng, "circle", { class: "sim-button-nut", cx: left + btnw - btnnm, cy: top + btnnm, r: btnn }); } outerBtn(25.9, 176.4); diff --git a/win10/app/package.appxmanifest b/win10/app/package.appxmanifest index 4b4765c6..74ee73b2 100644 --- a/win10/app/package.appxmanifest +++ b/win10/app/package.appxmanifest @@ -1,9 +1,9 @@  - + - codemicrobitapp + codethemicrobit Microsoft images\storelogo.png @@ -20,8 +20,8 @@ - - + + @@ -29,7 +29,6 @@ BBC micro:bit binary file - .hex file created with m.pxt.io or microbit.co.uk .hex