ADD playdate.system.setMenuImage()

src/playdate/bindings/system.nim

@@ -58,8 +58,8 @@ sdktype:
         setAutoLockDisabled {.importc: "setAutoLockDisabled".}: proc (disable: cint) {.
             cdecl, raises: [].}
 
-        setMenuImage {.importsdk.}: proc (bitmap: LCDBitmapPtr;
-            xOffset: cint)
+        setMenuImage {.importc: "setMenuImage".}: proc (bitmap: LCDBitmapPtr;
+            xOffset: cint) {.cdecl, raises: [].}
         addMenuItem {.importc: "addMenuItem".}: proc (title: cstring;
             callback: PDMenuItemCallbackFunctionRaw; userdata: pointer): PDMenuItemPtr {.
             cdecl, raises: [].}

src/playdate/domain/lcdbitmap.nim

@@ -0,0 +1,40 @@
+import std/importutils
+import ../bindings/[api, types, graphics]
+
+type
+    LCDBitmapObj = object of RootObj
+        res {.requiresinit.}: LCDBitmapPtr
+
+    LCDBitmapObjRef = ref LCDBitmapObj
+
+    LCDBitmap* = object
+        case managed: bool
+        of true:
+            obj: LCDBitmapObjRef
+        of false:
+            res: LCDBitmapPtr
+
+proc `=destroy`(this: var LCDBitmapObj) =
+    privateAccess(PlaydateGraphics)
+    if this.res != nil:
+        playdate.graphics.freeBitmap(this.res)
+
+proc `=copy`(a: var LCDBitmapObj, b: LCDBitmapObj) {.error.}
+
+converter bitmapPtr*(point: LCDBitmapPtr): auto =
+    LCDBitmap(managed: false, res: point)
+
+proc bitmapRef(point: LCDBitmapPtr): auto =
+    LCDBitmap(managed: true, obj: LCDBitmapObjRef(res: point))
+
+proc `==`*(bitmap: LCDBitmap, point: LCDBitmapPtr): bool =
+    not bitmap.managed and bitmap.res == point
+
+proc resource(bitmap: LCDBitmap): LCDBitmapPtr =
+    if bitmap.managed:
+        return if bitmap.obj != nil: bitmap.obj.res else: nil
+    else:
+        return bitmap.res
+
+proc isNil*(bitmap: LCDBitmap): bool =
+    return bitmap.resource == nil

src/playdate/graphics.nim

@@ -5,50 +5,14 @@ import std/importutils
 import system
 import bindings/[api, types]
 import bindings/graphics
+import domain/lcdbitmap {.all.}
+export lcdbitmap
 
 # Only export public symbols, then import all
 export graphics
 {.hint[DuplicateModuleImport]: off.}
 import bindings/graphics {.all.}
 
-type
-    LCDBitmapObj = object of RootObj
-        res {.requiresinit.}: LCDBitmapPtr
-
-    LCDBitmapObjRef = ref LCDBitmapObj
-
-    LCDBitmap* = object
-        case managed: bool
-        of true:
-            obj: LCDBitmapObjRef
-        of false:
-            res: LCDBitmapPtr
-
-proc `=destroy`(this: var LCDBitmapObj) =
-    privateAccess(PlaydateGraphics)
-    if this.res != nil:
-        playdate.graphics.freeBitmap(this.res)
-
-proc `=copy`(a: var LCDBitmapObj, b: LCDBitmapObj) {.error.}
-
-converter bitmapPtr*(point: LCDBitmapPtr): auto =
-    LCDBitmap(managed: false, res: point)
-
-proc bitmapRef(point: LCDBitmapPtr): auto =
-    LCDBitmap(managed: true, obj: LCDBitmapObjRef(res: point))
-
-proc `==`*(bitmap: LCDBitmap, point: LCDBitmapPtr): bool =
-    not bitmap.managed and bitmap.res == point
-
-proc resource*(bitmap: LCDBitmap): LCDBitmapPtr =
-    if bitmap.managed:
-        return if bitmap.obj != nil: bitmap.obj.res else: nil
-    else:
-        return bitmap.res
-
-proc isNil*(bitmap: LCDBitmap): bool =
-    return bitmap.resource == nil
-
 type LCDVideoPlayerObj = object of RootObj
     resource {.requiresinit.}: LCDVideoPlayerPtr
     context: LCDBitmap

src/playdate/system.nim

@@ -6,6 +6,7 @@ import sequtils
 
 import bindings/[api, types]
 import bindings/system
+import domain/lcdbitmap {.all.}
 
 # Only export public symbols, then import all
 export system
@@ -187,6 +188,14 @@ proc removeAllMenuItems*(this: ptr PlaydateSys) =
     this.removeAllMenuItems()
 # ---
 
+proc setMenuImage*(this: ptr PlaydateSys, image: LCDBitmap, xOffset: int32 = 0) =
+    privateAccess(PlaydateSys)
+    this.setMenuImage(
+        # if image != nil: image.resource else: nil
+        image.resource,
+        xOffset.cint
+    )
+
 proc getReduceFlashing* (this: ptr PlaydateSys): bool =
     privateAccess(PlaydateSys)
     return this.getReduceFlashing() == 1

tests/src/playdate_tests.nim

@@ -5,10 +5,11 @@
 ##
 
 import playdate/api
-import ../[t_buttons, t_graphics, t_nineslice, t_files, t_midi, t_scoreboards]
+import ../[ t_system, t_buttons, t_graphics, t_nineslice, t_files, t_midi, t_scoreboards]
 
 proc runTests() {.raises: [].} =
     try:
+        execSystemTests(false)
         execButtonsTests()
         execGraphicsTests(true)
         execNineSliceTests(true)

tests/t_system.nim

@@ -0,0 +1,18 @@
+import unittest, playdate/api
+
+proc execSystemTests*(runnable: bool)=
+  suite "System API":
+
+    test "setMenuImage with nil":
+      if(runnable):
+          playdate.system.setMenuImage(nil, 0)
+
+    test "setMenuImage with bitmap":
+      if(runnable):
+        let bgBitmap = playdate.graphics.newBitmap(400, 240, kColorBlack)
+        playdate.system.setMenuImage(bgBitmap, 0)
+
+when isMainModule:
+    # We can't run these methods from the tests, so we're only interested in
+    # whether they compile.
+    execSystemTests(runnable = false)