From 2c60348cb3e6f7415d58597ff660418bb036058b Mon Sep 17 00:00:00 2001
From: Stephanie Gawroriski <xer@multiphasicapps.net>
Date: Sun, 11 Aug 2024 15:16:24 +0000
Subject: [PATCH] Always have fallback element colors; Remove annotations from
 native method as there seems to be a compiler issue in Java 17 where it
 cannot properly parse them.

---
 .idea/compiler.xml                                 |  35 --------
 .idea/gradle.xml                                   |   1 -
 .idea/modules/squirreljme.iml                      | 100 +++++++++++----------
 .../scritchui/dylib/NativeScritchDylib.java        |  16 ++--
 nanocoat/lib/scritchui/framebuffer/fbIntern.c      |  37 +-------
 nanocoat/lib/scritchui/scritchLaf.c                |  44 ++++++++-
 6 files changed, 106 insertions(+), 127 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1b337dd69a..8a8e8d2c61 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -23,40 +23,7 @@
     </annotationProcessing>
     <bytecodeTargetLevel target="1.8">
       <module name="Projects.squirreljme.buildSrc.main" target="11" />
-      <module name="squirreljme.buildSrc" target="17" />
-      <module name="squirreljme.buildSrc.main" target="17" />
-      <module name="squirreljme.buildSrc.test" target="17" />
-      <module name="squirreljme.emulators.emulator-base" target="17" />
-      <module name="squirreljme.emulators.emulator-base.test" target="17" />
-      <module name="squirreljme.emulators.nanocoat-vm" target="17" />
-      <module name="squirreljme.emulators.nanocoat-vm.test" target="17" />
-      <module name="squirreljme.emulators.springcoat-vm" target="17" />
-      <module name="squirreljme.emulators.springcoat-vm.test" target="17" />
-      <module name="squirreljme.emulators.standalone" target="17" />
-      <module name="squirreljme.emulators.standalone.test" target="17" />
-      <module name="squirreljme.sdk" target="17" />
-      <module name="squirreljme.sdk.main" target="17" />
       <module name="squirreljme.sdk.test" target="17" />
-      <module name="squirreljme.tools.pcf-to-sqf" target="17" />
-      <module name="squirreljme.tools.pcf-to-sqf.main" target="17" />
-      <module name="squirreljme.tools.pcf-to-sqf.test" target="17" />
-      <module name="squirreljme.tools.sqf-to-c" target="17" />
-      <module name="squirreljme.tools.sqf-to-c.main" target="17" />
-      <module name="squirreljme.tools.sqf-to-c.test" target="17" />
-      <module name="squirreljme.tools.squirreljme-debugger" target="17" />
-      <module name="squirreljme.tools.squirreljme-debugger.main" target="17" />
-      <module name="squirreljme.tools.squirreljme-debugger.test" target="17" />
-      <module name="squirreljme.tools.squirreljme-font" target="17" />
-      <module name="squirreljme.tools.squirreljme-font.main" target="17" />
-      <module name="squirreljme.tools.squirreljme-font.test" target="17" />
-      <module name="squirreljme.tools.squirreljme-javap" target="17" />
-      <module name="squirreljme.tools.squirreljme-javap.main" target="17" />
-      <module name="squirreljme.tools.squirreljme-javap.test" target="17" />
-      <module name="squirreljme.tools.txt-to-pbm" target="17" />
-      <module name="squirreljme.tools.txt-to-pbm.main" target="17" />
-      <module name="squirreljme.tools.txt-to-pbm.test" target="17" />
-      <module name="squirreljme.tools.unzip" target="17" />
-      <module name="squirreljme.tools.unzip.main" target="17" />
       <module name="squirreljme.tools.unzip.test" target="17" />
       <module name="Stephanie Gawroriski.squirreljme.buildSrc.main" target="11" />
       <module name="stephanie.squirreljme.buildSrc" target="11" />
@@ -72,7 +39,6 @@
       <module name="stephanie.squirreljme.emulators.springcoat-vm.test" target="11" />
       <module name="stephanie.squirreljme.emulators.standalone" target="11" />
       <module name="stephanie.squirreljme.emulators.standalone.test" target="11" />
-      <module name="stephanie.squirreljme.sdk.test" target="17" />
       <module name="stephanie.squirreljme.tools.pcf-to-sqf" target="11" />
       <module name="stephanie.squirreljme.tools.pcf-to-sqf.main" target="11" />
       <module name="stephanie.squirreljme.tools.pcf-to-sqf.test" target="11" />
@@ -82,7 +48,6 @@
       <module name="stephanie.squirreljme.tools.txt-to-pbm" target="11" />
       <module name="stephanie.squirreljme.tools.txt-to-pbm.main" target="11" />
       <module name="stephanie.squirreljme.tools.txt-to-pbm.test" target="11" />
-      <module name="unzip.squirreljme.tools.unzip.test" target="17" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a6385cca44..258aefb635 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -99,7 +99,6 @@
             <option value="$PROJECT_DIR$/sdk" />
             <option value="$PROJECT_DIR$/tools" />
             <option value="$PROJECT_DIR$/tools/c-source-writer" />
-            <option value="$PROJECT_DIR$/tools/fake-javadoc-sdk" />
             <option value="$PROJECT_DIR$/tools/markdown-javadoc" />
             <option value="$PROJECT_DIR$/tools/pcf-to-sqf" />
             <option value="$PROJECT_DIR$/tools/sqf-to-c" />
diff --git a/.idea/modules/squirreljme.iml b/.idea/modules/squirreljme.iml
index 63c5fd4772..95f6962b3f 100644
--- a/.idea/modules/squirreljme.iml
+++ b/.idea/modules/squirreljme.iml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="squirreljme" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="cc.squirreljme" external.system.module.version="0.3.0" type="JAVA_MODULE" version="4">
-  <component name="AdditionalModuleElements">
-    <content url="file://$MODULE_DIR$/../.." dumb="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../..">
       <excludeFolder url="file://$MODULE_DIR$/../../.circleci" />
+      <excludeFolder url="file://$MODULE_DIR$/../../.flatpak-builder" />
       <excludeFolder url="file://$MODULE_DIR$/../../.fossil-settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../.github" />
       <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
@@ -11,9 +13,13 @@
       <excludeFolder url="file://$MODULE_DIR$/../../.vscode" />
       <excludeFolder url="file://$MODULE_DIR$/../../bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../build" />
+      <excludeFolder url="file://$MODULE_DIR$/../../build-dir" />
       <excludeFolder url="file://$MODULE_DIR$/../../config" />
       <excludeFolder url="file://$MODULE_DIR$/../../emulators/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../emulators/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../emulators/emulator-base-native/cmake-build-debug" />
+      <excludeFolder url="file://$MODULE_DIR$/../../emulators/emulator-base-native/cmake-build-release" />
+      <excludeFolder url="file://$MODULE_DIR$/../../emulators/emulator-base-native/cmake-build-relwithdebinfo" />
       <excludeFolder url="file://$MODULE_DIR$/../../emulators/emulator-base/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../emulators/emulator-base/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../emulators/emulator-base/out" />
@@ -41,6 +47,24 @@
       <excludeFolder url="file://$MODULE_DIR$/../../modules/bluetooth/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/bluetooth/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/bluetooth/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/c-source-writer/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/c-source-writer/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/c-source-writer/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-applet/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-applet/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-applet/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-pbp-awt-heavy/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-pbp-awt-heavy/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-pbp-awt-heavy/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-pbp/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-pbp/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-pbp/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-xlet/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-xlet/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-xlet/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc/out" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/cldc-compact/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/cldc-compact/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/cldc-compact/out" />
@@ -180,6 +204,9 @@
       <excludeFolder url="file://$MODULE_DIR$/../../modules/profile-meep/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/profile-meep/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/profile-meep/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/scritch-ui/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/scritch-ui/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/scritch-ui/out" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/squirrel-quarrel/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/squirrel-quarrel/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/squirrel-quarrel/out" />
@@ -210,6 +237,9 @@
       <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-jphone/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-jphone/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-jphone/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-khronos-opengles/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-khronos-opengles/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-khronos-opengles/out" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-kwisf-wipi/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-kwisf-wipi/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-kwisf-wipi/out" />
@@ -237,6 +267,9 @@
       <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-skt/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-skt/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-skt/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-softbank-mexa/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-softbank-mexa/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-softbank-mexa/out" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-sprintpcs/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-sprintpcs/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-sprintpcs/out" />
@@ -249,12 +282,22 @@
       <excludeFolder url="file://$MODULE_DIR$/../../modules/zip/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/zip/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../modules/zip/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../nanocoat/build" />
+      <excludeFolder url="file://$MODULE_DIR$/../../nanocoat/cmake-build-debug" />
+      <excludeFolder url="file://$MODULE_DIR$/../../nanocoat/cmake-build-release" />
+      <excludeFolder url="file://$MODULE_DIR$/../../nanocoat/cmake-build-relwithdebinfo" />
       <excludeFolder url="file://$MODULE_DIR$/../../out" />
       <excludeFolder url="file://$MODULE_DIR$/../../sdk/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../sdk/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../sdk/out" />
       <excludeFolder url="file://$MODULE_DIR$/../../tools/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../tools/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../tools/c-source-writer/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../tools/c-source-writer/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../tools/c-source-writer/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../tools/fake-javadoc-sdk/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../tools/fake-javadoc-sdk/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../tools/fake-javadoc-sdk/out" />
       <excludeFolder url="file://$MODULE_DIR$/../../tools/markdown-javadoc/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../tools/markdown-javadoc/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../tools/markdown-javadoc/out" />
@@ -268,6 +311,12 @@
       <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-debugger/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-debugger/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-debugger/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-font/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-font/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-font/out" />
+      <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-javap/.settings" />
+      <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-javap/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-javap/out" />
       <excludeFolder url="file://$MODULE_DIR$/../../tools/txt-to-pbm/.settings" />
       <excludeFolder url="file://$MODULE_DIR$/../../tools/txt-to-pbm/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../tools/txt-to-pbm/out" />
@@ -275,51 +324,8 @@
       <excludeFolder url="file://$MODULE_DIR$/../../tools/unzip/bin" />
       <excludeFolder url="file://$MODULE_DIR$/../../tools/unzip/out" />
       <excludeFolder url="file://$MODULE_DIR$/../../utils-dev" />
-      <excludeFolder url="file://$MODULE_DIR$/../../.flatpak-builder" />
-      <excludeFolder url="file://$MODULE_DIR$/../../nanocoat/build" />
-      <excludeFolder url="file://$MODULE_DIR$/../../nanocoat/cmake-build-debug" />
-      <excludeFolder url="file://$MODULE_DIR$/../../nanocoat/cmake-build-release" />
-      <excludeFolder url="file://$MODULE_DIR$/../../tools/fake-javadoc-sdk/.settings" />
-      <excludeFolder url="file://$MODULE_DIR$/../../tools/fake-javadoc-sdk/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../tools/fake-javadoc-sdk/out" />
-      <excludeFolder url="file://$MODULE_DIR$/../../build-dir" />
-      <excludeFolder url="file://$MODULE_DIR$/../../emulators/emulator-base-native/cmake-build-debug" />
-      <excludeFolder url="file://$MODULE_DIR$/../../emulators/emulator-base-native/cmake-build-release" />
-      <excludeFolder url="file://$MODULE_DIR$/../../emulators/emulator-base-native/cmake-build-relwithdebinfo" />
-      <excludeFolder url="file://$MODULE_DIR$/../../nanocoat/cmake-build-relwithdebinfo" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-applet/.settings" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-applet/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-applet/out" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-pbp-awt-heavy/.settings" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-pbp-awt-heavy/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-pbp-awt-heavy/out" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-pbp/.settings" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-pbp/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-pbp/out" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-xlet/.settings" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-xlet/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc-xlet/out" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc/.settings" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/cdc/out" />
-      <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-font/.settings" />
-      <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-font/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-font/out" />
-      <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-javap/.settings" />
-      <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-javap/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../tools/squirreljme-javap/out" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/scritch-ui/.settings" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/scritch-ui/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/scritch-ui/out" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-khronos-opengles/.settings" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-khronos-opengles/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-khronos-opengles/out" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-softbank-mexa/.settings" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-softbank-mexa/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/vendor-api-softbank-mexa/out" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/c-source-writer/.settings" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/c-source-writer/bin" />
-      <excludeFolder url="file://$MODULE_DIR$/../../modules/c-source-writer/out" />
     </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/emulators/emulator-base/src/main/java/cc/squirreljme/emulator/scritchui/dylib/NativeScritchDylib.java b/emulators/emulator-base/src/main/java/cc/squirreljme/emulator/scritchui/dylib/NativeScritchDylib.java
index 9b2fd4655f..1eebedaef1 100644
--- a/emulators/emulator-base/src/main/java/cc/squirreljme/emulator/scritchui/dylib/NativeScritchDylib.java
+++ b/emulators/emulator-base/src/main/java/cc/squirreljme/emulator/scritchui/dylib/NativeScritchDylib.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Range;
  */
 @SuppressWarnings("StaticMethodOnlyUsedInOneClass")
 public final class NativeScritchDylib
-{
+{ 
 	/** The state pointer. */
 	final long _stateP;
 	
@@ -489,14 +489,14 @@ public final class NativeScritchDylib
 	 */
 	static native PencilBracket __hardwareGraphics(
 		long __stateP,
-		@MagicConstant(valuesFromClass = UIPixelFormat.class) int __pf,
-		@Range(from = 0, to = Integer.MAX_VALUE) int __bw,
-		@Range(from = 0, to = Integer.MAX_VALUE) int __bh,
-		@NotNull Object __buf,
-		@Nullable int[] __pal,
+		int __pf,
+		int __bw,
+		int __bh,
+		Object __buf,
+		int[] __pal,
 		int __sx, int __sy,
-		@Range(from = 0, to = Integer.MAX_VALUE) int __sw,
-		@Range(from = 0, to = Integer.MAX_VALUE) int __sh)
+		int __sw,
+		int __sh)
 		throws MLECallError;
 	
 	/**
diff --git a/nanocoat/lib/scritchui/framebuffer/fbIntern.c b/nanocoat/lib/scritchui/framebuffer/fbIntern.c
index 75a0c4b68f..dd0365633b 100644
--- a/nanocoat/lib/scritchui/framebuffer/fbIntern.c
+++ b/nanocoat/lib/scritchui/framebuffer/fbIntern.c
@@ -14,39 +14,6 @@
 #include "lib/scritchui/scritchuiTypes.h"
 #include "lib/scritchui/framebuffer/fbIntern.h"
 
-static void sjme_scritchui_fb_intern_lafColor(
-	sjme_scritchui_lafElementColorType type,
-	sjme_jint* outColor)
-{
-	if (outColor == NULL)
-		return;
-
-	switch (type)
-	{
-			/* White. */
-		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_BACKGROUND:
-		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_PANEL_BACKGROUND:
-			*outColor = 0xFFFFFFFF;
-			break;
-
-			/* Gray. */
-		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_HIGHLIGHTED_BORDER:
-		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_FOCUS_BORDER:
-		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_HIGHLIGHTED_BACKGROUND:
-			*outColor = 0xFF7F7F7F;
-			break;
-
-			/* Black. */
-		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_BORDER:
-		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_FOREGROUND:
-		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_HIGHLIGHTED_FOREGROUND:
-		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_PANEL_FOREGROUND:
-		default:
-			*outColor = 0xFF000000;
-			break;
-	}
-}
-
 static sjme_errorCode sjme_scritchui_fb_selLock(
 	sjme_attrInNotNull sjme_scritchui_pencil g)
 {
@@ -598,10 +565,10 @@ sjme_errorCode sjme_scritchui_fb_intern_render(
 	/* Obtain all the look and feel colors, if any fail fallback to default. */
 	memset(lafColors, 0, sizeof(lafColors));
 	for (i = 0; i < SJME_SCRITCHUI_NUM_LAF_ELEMENT_COLOR; i++)
-		if (sjme_error_is(error = inState->api->lafElementColor(
+		if (sjme_error_is(error = inState->apiInThread->lafElementColor(
 			inState, inComponent,
 			&lafColors[i], i)))
-			sjme_scritchui_fb_intern_lafColor(i, &lafColors[i]);
+			lafColors[i] = 0xFF000000;
 	
 	/* Perform all drawing operations. */
 	for (dlIndex = 0; dlIndex < dlCount; dlIndex++)
diff --git a/nanocoat/lib/scritchui/scritchLaf.c b/nanocoat/lib/scritchui/scritchLaf.c
index 691257a4e1..5e47daf0c3 100644
--- a/nanocoat/lib/scritchui/scritchLaf.c
+++ b/nanocoat/lib/scritchui/scritchLaf.c
@@ -11,6 +11,39 @@
 #include "lib/scritchui/core/core.h"
 #include "sjme/alloc.h"
 
+static void sjme_scritchui_core_lafFallbackColor(
+	sjme_scritchui_lafElementColorType type,
+	sjme_jint* outColor)
+{
+	if (outColor == NULL)
+		return;
+
+	switch (type)
+	{
+			/* White. */
+		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_BACKGROUND:
+		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_PANEL_BACKGROUND:
+			*outColor = 0xFFFFFFFF;
+			break;
+
+			/* Gray. */
+		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_HIGHLIGHTED_BORDER:
+		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_FOCUS_BORDER:
+		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_HIGHLIGHTED_BACKGROUND:
+			*outColor = 0xFF7F7F7F;
+			break;
+
+			/* Black. */
+		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_BORDER:
+		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_FOREGROUND:
+		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_HIGHLIGHTED_FOREGROUND:
+		case SJME_SCRITCHUI_LAF_ELEMENT_COLOR_PANEL_FOREGROUND:
+		default:
+			*outColor = 0xFF000000;
+			break;
+	}
+}
+
 sjme_errorCode sjme_scritchui_core_lafElementColor(
 	sjme_attrInNotNull sjme_scritchui inState,
 	sjme_attrInNullable sjme_scritchui_uiComponent inContext,
@@ -40,7 +73,16 @@ sjme_errorCode sjme_scritchui_core_lafElementColor(
 	/* Obtain theme color. */
 	else if (sjme_error_is(error = inState->impl->lafElementColor(
 		inState, inContext, &rgb, elementColor)))
-		return sjme_error_default(error);
+	{
+		/* Use fallback color. */
+		if (error == SJME_ERROR_INVALID_ARGUMENT)
+			sjme_scritchui_core_lafFallbackColor(elementColor,
+				&rgb);
+		
+		/* Fail otherwise. */
+		else
+			return sjme_error_default(error);
+	}
 	
 	/* Normalize color. */
 	*outRGB = rgb | 0xFF000000;
-- 
2.11.4.GIT