Update pxt/common-packages and fix build (#2323)

* fix build off of pxt/ and pxt-common-packages master

* check in generated files
This commit is contained in:
Joey Wunderlich
2019-07-30 09:45:32 -07:00
committed by GitHub
parent 98490b1c69
commit 34fd7e0600
9 changed files with 24 additions and 14 deletions

View File

@ -146,8 +146,9 @@ namespace pxsim.visuals {
let btng = <SVGGElement>svg.elt("g");
let btn = svg.child(btng, "rect", { class: "sim-button-virtual", x: x, y: y, rx: corner, ry: corner, width: w, height: w});
let btnTxt = mkTxt(cx + txtXOff, cy + txtYOff, txtSize, 0, "A+B");
svg.addClass(btnTxt, "sim-text")
svg.addClass(btnTxt, "sim-text-virtual");
U.addClass(btnTxt, "sim-text")
U.addClass(btnTxt, "sim-text-virtual");
btng.appendChild(btnTxt);
return btng;
@ -157,7 +158,7 @@ namespace pxsim.visuals {
this.abBtn.style.visibility = "hidden";
let el = svg.elt("g");
svg.addClass(el, "sim-buttonpair")
U.addClass(el, "sim-buttonpair")
el.appendChild(this.aBtn);
el.appendChild(this.bBtn);
el.appendChild(this.abBtn);

View File

@ -28,7 +28,7 @@ namespace pxsim {
this.data = data;
}
public print() {
console.debug(`Image id:${this.id} refs:${this.refcnt} size:${this.width}x${Image.height}`)
console.debug(`Image id:${this.id} size:${this.width}x${Image.height}`)
}
public get(x: number, y: number): number {
x = x >> 0;
@ -76,7 +76,6 @@ namespace pxsim {
export function createInternalImage(width: number): Image {
width = width >> 0;
let img = createImage(width)
pxsim.runtime.unregisterLiveObject(img, true)
return img
}