From 717cda0800f15655045c3cd5883f35c2dfe6e5ab Mon Sep 17 00:00:00 2001 From: andrewchilicki Date: Sat, 8 Feb 2025 15:26:13 -0500 Subject: [PATCH] Apply 'lumonBlue' tint to number images to match UI --- assets/numbers/0.png | Bin 2149 -> 2149 bytes assets/numbers/1.png | Bin 432 -> 432 bytes assets/numbers/2.png | Bin 1634 -> 1634 bytes assets/numbers/3.png | Bin 1927 -> 1927 bytes assets/numbers/4.png | Bin 940 -> 940 bytes assets/numbers/5.png | Bin 1716 -> 1716 bytes assets/numbers/6.png | Bin 2228 -> 2228 bytes assets/numbers/7.png | Bin 1260 -> 1260 bytes assets/numbers/8.png | Bin 2198 -> 2198 bytes assets/numbers/9.png | Bin 2192 -> 2192 bytes src/UI/Widgets/NumbersPanel.cpp | 11 ++++------- 11 files changed, 4 insertions(+), 7 deletions(-) diff --git a/assets/numbers/0.png b/assets/numbers/0.png index 0941932ad9602b93e35063a44bd83bae5c3c80bb..e27cd1dfa89165ae1c24f80917a591a2a3cab0b5 100644 GIT binary patch delta 623 kcmaDV@Kj)eU;Y1q1*7&4Z1^YB*m~n#JL5L5W!k|C02uya4gdfE delta 623 zcmYLGNlpVX5JX7a^OqbDf<*Q>MB>7Uynu(yB@f6)IC0@G;LMT*lqhegR9AZjsbzVo zuBt8{CWp!9wSL$kcBooZ+fs3h)SzPNa^7N|k$9;htZcI3*`Bx&fXC$zmVb6MSZ7Gz z-vHrQV4*So@>DmNqMYNv!e$nI_{Q~IX5nHPvtN)jj$FdOd?UCvsaTvroZd_Rs<)d! zMUkhr#^bpRM6MMdBw!vjsD_J3Z%yM z5r}jF3f>1XKqlM=sR6NpB0vUE3e0r^ii6GB^vd)Y0|SF^H?a)@Vy+x}3q98FU8vYJgzoKzcOk2Pp5cgJ2jOWFO^rF1r z@&f@}yK6(d&;C#-sY#PgQLS=Iaz1< diff --git a/assets/numbers/3.png b/assets/numbers/3.png index 36c76f8ebff128d271f0b47ae665df21b40c1b9e..fb2ffd780276e204f02ae8a3686701f7832aaa74 100644 GIT binary patch delta 596 kcmZqYZ|9%jSO0%t!KnQM8~z^DuzqpO3e(M#n7*^^M0Jik_ej7 zn8MCos}m{7glry*dKnOerENe_<6vBZ<|PMn^1SG7?YS!gqHZN`yxN$cJrp9TpHtUI zu#IzJHm-fWRl|z#5JEKM!bJ5Ed#Bz1VED(`nW@#yxsTyCAY3jTT+o%_o6%c-MYBQ8 j#-5$X5&je4Mslq%WV&3H8*Xa}PSM-TF?Pe2FalU diff --git a/assets/numbers/4.png b/assets/numbers/4.png index 55aa2fc6b1a006d5b0f343a6b1325865941cc776..4e58e29bb27d6dfb5c9637c815be1ca4185e7d5f 100644 GIT binary patch delta 267 xcmZ3(zJ`5*U;Y1q1$48&yLvA>0|SF!NswPKgN;MVe<9r;+z&Qw_F+t50sxeZ^6&rv delta 267 zcmXv|IS#@w5HvIqqT?St04YLt5+VxZ0z^;26X^2=K0%iXzJm{-;R$rZter@!)z0qB z?DR!nTy3Wvnt;lq_E>$;IMfd9S2nT?&_Pb^Q=o#(6**p*S(Rb=5@?bS9XL?PjfU{0 zcuGC<38gxZ&3jkTMzDRw-pK TdwWo&K4Y=`&Ex&Co1CV9te>yq diff --git a/assets/numbers/5.png b/assets/numbers/5.png index 4ae9da989f400647c1081ff047eeeee2402b590e..8d2f38b0a885865973bdcf4667b642ae007eb6a7 100644 GIT binary patch delta 527 hcmdnOyM=dxU;Y1q1*7&4X!vt8@7LS4*_SDu1ps0m0HOc@ delta 527 zcmYjNL2kl846GJF+a69^YN14l$sa~pNzZb)7RHaRj8 uIYl{bGYa4;p{G*yL%J|zZFGVGQ%r#SR;{fr8FzCS-#qWX?_Zy@-TVRdgl`W3 diff --git a/assets/numbers/6.png b/assets/numbers/6.png index e039bf39f6442ecfcbee3cc44aa2f9f02f0829e3..e25e13e35eb1dfb5a6c2e3308a8fa1b1b0041b3d 100644 GIT binary patch delta 651 hcmdlYxJ7V+U;Y1q1*7(l*zkYX>7c-{`6Sb8RsaH>e9-^^ delta 651 zcmYk3O-{p541_Br4$!l7fe^GxUqYAcSaS_lh10GvKqR@Bhb<84E?B6CKl#OjGZ%~0Qwr&+i?GGeWQB^=3 z;q}=+P$bLpv;FL6AA@7Cp60eexk`=yLR;TEHB@4=m|q$uvejkHz&$a{Ys)kWMA3-a-@&s g%=i1(g)!!NIh#J2o{eTWKfJ6?MR)V@R&@Gze}2sisQ>@~ diff --git a/assets/numbers/8.png b/assets/numbers/8.png index f843b51d42f8148fa952fa2c7b86b439522412d4..020f85ec39e6bb7b49808916161edf1664bb1d3a 100644 GIT binary patch delta 626 kcmbOxI8AVZU;Y1q1*7&4Z1|_q-um{u&963ZV0y+10Nf8{F#rGn delta 626 zcmYk3!A-+Z5JV#+3P=mIzyU=N>&LbtamkGqXu~aVN&!@WL@V6Du@ff_5~7CX?QFh< z^kvQNpPiY%-p;r4mrYZ&R&jP#ax(C;^$vhr@JhJsax;_DXyrk-qB*~_`yZ?J7unR= z`de6pCzFxJU92~g=@Y*g;Mf>CqX!QnXUwyOjcMc#W2E)JKn+q?MB{!CW_R8UDXe7h^e4IL#eXZVhqOyH0xG0f7mKMO46-`<6#q^V;^+xR z3Og3WG!X$;<6WG|CN!W$Go&eZfCJx4#ePslZI&#}ZjkCxLz=XCCAG0uE_yCRqy!@# zCC~VqRFVf%$vrE_zfx^vvR3wN>u4trS95XBz23~Gm+oYKefRkM@^pW@SRE`6{{Ueu B!Giz* diff --git a/src/UI/Widgets/NumbersPanel.cpp b/src/UI/Widgets/NumbersPanel.cpp index 02c3189..7fadae5 100644 --- a/src/UI/Widgets/NumbersPanel.cpp +++ b/src/UI/Widgets/NumbersPanel.cpp @@ -183,14 +183,11 @@ private: } // Colour - auto col = gridNumber->badGroup ? ImVec4(255,0,0,255) : ImVec4(255,255,255,numberAlpha); - if (gridNumber->badGroup && gridNumber->badGroup->isActive) + auto col = ColorValues::lumonBlue.Value; + col.w = numberAlpha; + if (revealMap && gridNumber->badGroup) { - col = ImVec4(255,255,0,numberAlpha); - } - if (!revealMap) - { - col = ImVec4(255,255,255,numberAlpha); + col = gridNumber->badGroup->isActive ? ImVec4(255,255,0,numberAlpha) : ImVec4(255,0,0,255); } // Scale from mouse hovering