Mercurial > dwindows

changeset 2654:fe186c9318cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Android: More resource changes, for windowSetBitmap and pixmapNew.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 15 Sep 2021 08:05:39 +0000
parents 297456a381e4
children 5b63a3ed8e10
files android/DWindows.kt
diffstat 1 files changed, 17 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/android/DWindows.kt	Tue Sep 14 19:39:07 2021 +0000
+++ b/android/DWindows.kt	Wed Sep 15 08:05:39 2021 +0000
@@ -2956,20 +2956,25 @@
         return imageview
     }
 
-    fun windowSetBitmap(window: View, resID: Int, filename: String?)
+    fun windowSetBitmap(window: View, resID: Int, file: String?)
     {
         waitOnUiThread {
-            if(resID != 0) {
-                if(window is ImageButton) {
+            var filename: String? = file
+
+            if(resID > 0 && resID < 65536) {
+                filename = resID.toString()
+            } else if(resID != 0) {
+                if (window is ImageButton) {
                     val button = window
 
                     button.setImageResource(resID)
-                } else if(window is ImageView) {
+                } else if (window is ImageView) {
                     val imageview = window
 
                     imageview.setImageResource(resID)
                 }
-            } else if(filename != null) {
+            }
+            if(filename != null) {
                 val exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
 
                 for (ext in exts) {
@@ -3067,16 +3072,21 @@
         return icon
     }
 
-    fun pixmapNew(width: Int, height: Int, filename: String?, data: ByteArray?, length: Int, resID: Int): Bitmap?
+    fun pixmapNew(width: Int, height: Int, file: String?, data: ByteArray?, length: Int, resID: Int): Bitmap?
     {
         var pixmap: Bitmap? = null
 
         waitOnUiThread {
+            var filename: String? = file
+
             if(width > 0 && height > 0) {
                 pixmap = Bitmap.createBitmap(null, width, height, Bitmap.Config.ARGB_8888)
+            } else if(resID > 0 && resID < 65536) {
+                filename = resID.toString()
             } else if(resID != 0) {
                 pixmap = BitmapFactory.decodeResource(resources, resID)
-            } else if(filename != null) {
+            }
+            if(filename != null) {
                 val exts = arrayOf("", ".png", ".webp", ".jpg", ".jpeg", ".gif")
 
                 for (ext in exts) {