From 9ae02be51ff9cfdcb0bdc84172ecfca20c653b2c Mon Sep 17 00:00:00 2001
From: Richard Knoll <riknoll@microsoft.com>
Date: Tue, 10 Oct 2023 16:59:33 -0700
Subject: [PATCH] add icon blit method

---
 libs/screen/image.cpp    |  8 +++++++-
 libs/screen/image.ts     | 17 +++++++++++++++++
 libs/screen/sim/image.ts |  8 +++++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/libs/screen/image.cpp b/libs/screen/image.cpp
index 70aab12b0..1e4c3e92d 100644
--- a/libs/screen/image.cpp
+++ b/libs/screen/image.cpp
@@ -1086,6 +1086,7 @@ bool blit(Image_ dst, Image_ src, pxt::RefCollection *args) {
     int hSrc = pxt::toInt(args->getAt(7));
     bool transparent = pxt::toBoolQuick(args->getAt(8));
     bool check = pxt::toBoolQuick(args->getAt(9));
+    int color = pxt::toInt(args->getAt(10));
 
     int xSrcStep = (wSrc << 16) / wDst;
     int ySrcStep = (hSrc << 16) / hDst;
@@ -1118,7 +1119,12 @@ bool blit(Image_ dst, Image_ src, pxt::RefCollection *args) {
                 continue;
             }
             if (!transparent || cSrc) {
-                setCore(dst, xDstCur, yDstCur, cSrc);
+                if (color) {
+                    setCore(dst, xDstCur, yDstCur, color);
+                }
+                else {
+                    setCore(dst, xDstCur, yDstCur, cSrc);
+                }
             }
         }
     }
diff --git a/libs/screen/image.ts b/libs/screen/image.ts
index 77ffc63fa..c1b506d28 100644
--- a/libs/screen/image.ts
+++ b/libs/screen/image.ts
@@ -164,6 +164,23 @@ namespace helpers {
         _blitArgs[7] = hSrc | 0;
         _blitArgs[8] = transparent ? 1 : 0;
         _blitArgs[9] = check ? 1 : 0;
+        _blitArgs[10] = 0;
+        return _blit(img, src, _blitArgs);
+    }
+
+    export function iconBlit(img: Image, xDst: number, yDst: number, wDst: number, hDst: number, src: Image, xSrc: number, ySrc: number, wSrc: number, hSrc: number, transparent: boolean, check: boolean, color: number): boolean {
+        _blitArgs = _blitArgs || [];
+        _blitArgs[0] = xDst | 0;
+        _blitArgs[1] = yDst | 0;
+        _blitArgs[2] = wDst | 0;
+        _blitArgs[3] = hDst | 0;
+        _blitArgs[4] = xSrc | 0;
+        _blitArgs[5] = ySrc | 0;
+        _blitArgs[6] = wSrc | 0;
+        _blitArgs[7] = hSrc | 0;
+        _blitArgs[8] = transparent ? 1 : 0;
+        _blitArgs[9] = check ? 1 : 0;
+        _blitArgs[10] = color;
         return _blit(img, src, _blitArgs);
     }
 
diff --git a/libs/screen/sim/image.ts b/libs/screen/sim/image.ts
index ece299893..cebd4d5d0 100644
--- a/libs/screen/sim/image.ts
+++ b/libs/screen/sim/image.ts
@@ -895,6 +895,7 @@ namespace pxsim.ImageMethods {
         const hSrc = args.getAt(7) as number;
         const transparent = args.getAt(8) as number;
         const check = args.getAt(9) as number;
+        const color = args.getAt(10) as number;
 
         const xSrcStep = ((wSrc << 16) / wDst) | 0;
         const ySrcStep = ((hSrc << 16) / hDst) | 0;
@@ -927,7 +928,12 @@ namespace pxsim.ImageMethods {
                     continue;
                 }
                 if (!transparent || cSrc) {
-                    setPixel(dst, xDstCur, yDstCur, cSrc);
+                    if (color) {
+                        setPixel(dst, xDstCur, yDstCur, color);
+                    }
+                    else {
+                        setPixel(dst, xDstCur, yDstCur, cSrc);
+                    }
                 }
             }
         }