From 3b84319f83741011649ee52f3d8a2441593f5125 Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Sun, 19 Jul 2026 19:56:13 -0400
Subject: [PATCH] Fix misc. issues on b&w watches due to GCompOpSet

---
 neat_bar                               |   2 +-
 package.json                           |   4 ++--
 resources/logo_25~bw.png               | Bin 154 -> 144 bytes
 resources/next~bw.png                  | Bin 0 -> 82 bytes
 resources/{next.png => next~color.png} | Bin
 resources/pin~bw.png                   | Bin 0 -> 105 bytes
 resources/{pin.png => pin~color.png}   | Bin
 resources/prev~bw.png                  | Bin 0 -> 80 bytes
 resources/{prev.png => prev~color.png} | Bin
 src/c/main.c                           |   2 ++
 10 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 resources/next~bw.png
 rename resources/{next.png => next~color.png} (100%)
 create mode 100644 resources/pin~bw.png
 rename resources/{pin.png => pin~color.png} (100%)
 create mode 100644 resources/prev~bw.png
 rename resources/{prev.png => prev~color.png} (100%)

diff --git a/neat_bar b/neat_bar
index 1ec561c..7fc72e0 160000
--- a/neat_bar
+++ b/neat_bar
@@ -1 +1 @@
-Subproject commit 1ec561c3e1d1d891f225f9fae009b7a6d7189f95
+Subproject commit 7fc72e0b083e679135abe201a99969b8751e49fd
diff --git a/package.json b/package.json
index cb6cb24..facc37f 100644
--- a/package.json
+++ b/package.json
@@ -66,10 +66,10 @@
         "sdkVersion": "3",
         "targetPlatforms": [
             "basalt",
-            "diorite",
             "chalk",
-            "flint",
+            "diorite",
             "emery",
+            "flint",
             "gabbro"
         ],
         "uuid": "3097b48e-552c-4a78-92b2-566b9128640e",
diff --git a/resources/logo_25~bw.png b/resources/logo_25~bw.png
index 2be3397e9f332511c902f1335e3522163f72d822..73ae1c6cef1b925879aff5afcd841f92208cfdb9 100644
GIT binary patch
delta 127
zcmbQmIDv73L<J)Q5WJbR;~bC*_jGX#sbCa2(#YBnAkzBKULZhv&oz#>-}K&w>P}k3
z%G6R~-G1KvnP67v)>W!k-|4yYn$1!$XfVrvA+gZl;D?>Z=dPa>`tq**Z~Fw*grfqv
e3JhlKNg51#*6Ph|r^`QqtnzgAb6Mw<&;$VQ(=gZo

delta 138
zcmV;50CoS60h$4j7=H)`0002Q>4jqe003c0L_t(|0o9ZN2EYIe#QOhF-v9xKt)~{k
zhBn4@7Rh*S0_g@I-2kK;fZ#3>YErNqz-j<_z%QtX7(hSA3%rbgh&ZZ|!k4(^I<m0b
sMEvqj1Qb`lFm6PS&&uB~F*E}Y8-RSSK1R+J00000NkvXXt^-0~f@G#P7XSbN

diff --git a/resources/next~bw.png b/resources/next~bw.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec2e2d5eaabb47ffa97b277646176a3036bb17cc
GIT binary patch
literal 82
zcmeAS@N?(olHy`uVBq!ia0vp^AT~QAkYJF!{_q@#@^o<wsbEarU~@pBu%YpABO^zH
c%7olX1_rI&EXLeX9YP?*p00i_>zopr0Jn4#SO5S3

literal 0
HcmV?d00001

diff --git a/resources/next.png b/resources/next~color.png
similarity index 100%
rename from resources/next.png
rename to resources/next~color.png
diff --git a/resources/pin~bw.png b/resources/pin~bw.png
new file mode 100644
index 0000000000000000000000000000000000000000..ada1682a1baeb8d55d08e64298ff0b92b0224693
GIT binary patch
literal 105
zcmeAS@N?(olHy`uVBq!ia0vp^{6H+s2qYNNcV@8zDFaUz$B+uf<R8JuKREV1ER;X|
zxme=`qx@k;Gq!*1Jm2gkp4BF0ShGC(w;}n*cm5`ZAC}UpZX5GeKxTNl`njxgN@xNA
Drnex4

literal 0
HcmV?d00001

diff --git a/resources/pin.png b/resources/pin~color.png
similarity index 100%
rename from resources/pin.png
rename to resources/pin~color.png
diff --git a/resources/prev~bw.png b/resources/prev~bw.png
new file mode 100644
index 0000000000000000000000000000000000000000..44523e9726a1ecf5e0eb134d2820d0078c781dd5
GIT binary patch
literal 80
zcmeAS@N?(olHy`uVBq!ia0vp^AT~QAkYJF!{_q@-68Cg*45?sDt~hs~pr>(RD<eyk
cL(T#Y1_N)F<f)%Ef<a0>UHx3vIVCg!0Hzxg*8l(j

literal 0
HcmV?d00001

diff --git a/resources/prev.png b/resources/prev~color.png
similarity index 100%
rename from resources/prev.png
rename to resources/prev~color.png
diff --git a/src/c/main.c b/src/c/main.c
index d2e8dee..ff7b700 100644
--- a/src/c/main.c
+++ b/src/c/main.c
@@ -190,7 +190,9 @@ static void main_window_load(Window *window) {
 	// sleep bar and icon
 	s_sleep_bar_layer = layer_create(s_sleep_bar_start);
 	s_logo_layer = bitmap_layer_create(s_logo_start);
+#if PBL_COLOR
 	bitmap_layer_set_compositing_mode(s_logo_layer, GCompOpSet);
+#endif
 	bitmap_layer_set_bitmap(s_logo_layer, s_logo_icon);
 
 	s_last_watched_layer = text_layer_create(GRect(MARGIN, 0, PBL_DISPLAY_WIDTH - (2 * MARGIN) - NEAT_BAR_WIDTH - PBL_IF_ROUND_ELSE(0, MARGIN / 2), s_available_height)); // y position updated when layer is written to