merge fixes

Author: KierPalin

pxt.json

@@ -35,4 +35,39 @@
   "supportedTargets": [
     "microbit"
   ]
+  "name": "user-interface-base",
+  "version": "0.0.23",
+  "dependencies": {
+    "core": "file:../core",
+    "radio": "file:../radio",
+    "microphone": "file:../microphone",
+    "display-shield": "file:../display-shield",
+    "jacdac-display-rp2040": "file:../../../jacdac-display/pxt-maker/libs/jacdac-display-rp2040"
+  },
+  "files": [
+    "affine.ts",
+    "bounds.ts",
+    "component.ts",
+    "math.ts",
+    "screen.ts",
+    "sprite.ts",
+    "appconfig.ts",
+    "accessibility.ts",
+    "keymap.ts",
+    "button.ts",
+    "scene.ts",
+    "cursor.ts",
+    "picker.ts",
+    "navigator.ts",
+    "cursorscene.ts",
+    "options.ts",
+    "coreAssets.ts"
+  ],
+  "testFiles": [
+    "test.ts"
+  ],
+  "testDependencies": {},
+  "supportedTargets": [
+    "microbit"
+  ]
 }

screen.ts

@@ -87,6 +87,7 @@ namespace user_interface_base {
       switch (Screen.connectedDisplayType) {
         case ConnectedDisplayType.NONE: {
           Screen.updateConnectedDisplayType();
+          Screen.updateConnectedDisplayType();
         }
         case ConnectedDisplayType.DISPLAY_SHIELD: {
           Screen.image.drawTransparentBitmap(from, Screen.x(x), Screen.y(y));
@@ -105,6 +106,10 @@ namespace user_interface_base {
       from: Bitmap,
       x: number,
       y: number
+      xfrm: Affine,
+      from: Bitmap,
+      x: number,
+      y: number
     ) {
       const w = xfrm.worldPos
       Screen.image.drawTransparentBitmap(
@@ -120,6 +125,11 @@ namespace user_interface_base {
       x1: number,
       y1: number,
       c: number
+      x0: number,
+      y0: number,
+      x1: number,
+      y1: number,
+      c: number
     ) {
       const SCREEN_FN_ID_DRAW_LINE: number = 9;
       switch (Screen.connectedDisplayType) {
@@ -158,6 +168,12 @@ namespace user_interface_base {
       x1: number,
       y1: number,
       c: number
+      xfrm: Affine,
+      x0: number,
+      y0: number,
+      x1: number,
+      y1: number,
+      c: number
     ) {
       const w = xfrm.worldPos
       Screen.drawLine(x0 + w.x, y0 + w.y, x1 + w.x, y1 + w.y, c)
@@ -169,6 +185,11 @@ namespace user_interface_base {
       x1: number,
       y1: number,
       shader: (x: number, y: number) => number
+      x0: number,
+      y0: number,
+      x1: number,
+      y1: number,
+      shader: (x: number, y: number) => number
     ) {
       const SCREEN_FN_ID_SET_PIXEL: number = 21;
 
@@ -211,6 +232,11 @@ namespace user_interface_base {
       width: number,
       height: number,
       c: number
+      x: number,
+      y: number,
+      width: number,
+      height: number,
+      c: number
     ) {
       const SCREEN_FN_ID_DRAW_RECT: number = 12;
 
@@ -237,6 +263,12 @@ namespace user_interface_base {
       width: number,
       height: number,
       c: number
+      xfrm: Affine,
+      x: number,
+      y: number,
+      width: number,
+      height: number,
+      c: number
     ) {
       const w = xfrm.worldPos
       Screen.drawRect(x + w.x, y + w.y, width, height, c);
@@ -273,6 +305,12 @@ namespace user_interface_base {
       width: number,
       height: number,
       c: number
+      xfrm: Affine,
+      x: number,
+      y: number,
+      width: number,
+      height: number,
+      c: number
     ) {
       const w = xfrm.worldPos
       Screen.fillRect(x + w.x, y + w.y, width, height, c)
@@ -306,6 +344,10 @@ namespace user_interface_base {
       bounds: Bounds,
       dist: number,
       c: number
+      xfrm: Affine,
+      bounds: Bounds,
+      dist: number,
+      c: number
     ) {
       if (!c) return
 
@@ -343,6 +385,10 @@ namespace user_interface_base {
       bounds: Bounds,
       dist: number,
       colors: { top: number; left: number; right: number; bottom: number }
+      xfrm: Affine,
+      bounds: Bounds,
+      dist: number,
+      colors: { top: number; left: number; right: number; bottom: number }
     ) {
       // no borders!
       if (!colors.top && !colors.left && !colors.right && !colors.bottom)
@@ -452,6 +498,10 @@ namespace user_interface_base {
       x: number,
       y: number,
       c: number
+      xfrm: Affine,
+      x: number,
+      y: number,
+      c: number
     ) {
       const w = xfrm.worldPos
       Screen.setPixel(x + w.x, y + w.y, c)
@@ -464,6 +514,12 @@ namespace user_interface_base {
       color?: number,
       font?: bitmaps.Font,
       offsets?: texteffects.TextEffectState[]
+      text: string,
+      x: number,
+      y: number,
+      color?: number,
+      font?: bitmaps.Font,
+      offsets?: texteffects.TextEffectState[]
     ) {
       const SCREEN_FN_ID_PRINT: number = 23;