From 7641a44048177ad8ca9eed512b4f33ba273bf1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tilo=20Pr=C3=BCtz?= <tilo@pruetz.net>
Date: Tue, 18 Jun 2024 21:35:07 +0200
Subject: [PATCH] [widget][theme] use warningOnBackground color instead of
 warning where appropriate

---
 theme/icons.go                                |   2 +-
 theme/icons_test.go                           |   6 +++---
 widget/label.go                               |   2 +-
 .../label/label_importance_warning.png        | Bin 1390 -> 1382 bytes
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/theme/icons.go b/theme/icons.go
index 894f91e1d9..359e70ec3b 100644
--- a/theme/icons.go
+++ b/theme/icons.go
@@ -679,7 +679,7 @@ func NewThemedResource(src fyne.Resource) *ThemedResource {
 func NewWarningThemedResource(src fyne.Resource) *ThemedResource {
 	return &ThemedResource{
 		source:    src,
-		ColorName: ColorNameWarning,
+		ColorName: ColorNameWarningOnBackground,
 	}
 }
 
diff --git a/theme/icons_test.go b/theme/icons_test.go
index a2fc296665..da8502d6af 100644
--- a/theme/icons_test.go
+++ b/theme/icons_test.go
@@ -157,11 +157,11 @@ func TestThemedResource_Warning(t *testing.T) {
 	fyne.CurrentApp().Settings().SetTheme(theme.DarkTheme())
 	source := helperNewStaticResource()
 	custom := theme.NewThemedResource(source)
-	custom.ColorName = theme.ColorNameWarning
+	custom.ColorName = theme.ColorNameWarningOnBackground
 
-	assert.Equal(t, custom.Name(), fmt.Sprintf("warning_%v", source.Name()))
+	assert.Equal(t, custom.Name(), fmt.Sprintf("warningOnBackground_%v", source.Name()))
 	custom = theme.NewWarningThemedResource(source)
-	assert.Equal(t, custom.Name(), fmt.Sprintf("warning_%v", source.Name()))
+	assert.Equal(t, custom.Name(), fmt.Sprintf("warningOnBackground_%v", source.Name()))
 }
 
 func TestDisabledResource_Name(t *testing.T) {
diff --git a/widget/label.go b/widget/label.go
index 78637c792a..f8ecd069b1 100644
--- a/widget/label.go
+++ b/widget/label.go
@@ -134,7 +134,7 @@ func (l *Label) syncSegments() {
 	case DangerImportance:
 		color = theme.ColorNameErrorOnBackground
 	case WarningImportance:
-		color = theme.ColorNameWarning
+		color = theme.ColorNameWarningOnBackground
 	case SuccessImportance:
 		color = theme.ColorNameSuccessOnBackground
 	default:
diff --git a/widget/testdata/label/label_importance_warning.png b/widget/testdata/label/label_importance_warning.png
index 21d8b586a7cf5f0db5f3f17cb20926a8c40db8cd..cd87b911ae96f21d00c330a7c2eea50c750497f5 100644
GIT binary patch
delta 1319
zcmV+?1=#xT3g!xsB!4YQL_t(|oa~ufOcPlcfX{S##TH7-MQM?Wg4h6oXe`OH3D+27
z)DRM4B!P%TiHYIGL}HB5XynO=8lSxIWW-w_LP;>jAkl?g5xiC0wv;M%Tcm|D_A;H)
znT?Ly#r0r^3ak(33lEc-zyJTw$3JrplwVd>1`yxC`@b9bNs+M{e;_Y#kQX?}3moJH
z4)OwrtCzYu^Tv%X?s?PFJckY$*yEi$$IHv@QMCue;!s_k`Sj`G#>SE8GDHVgFFKu5
zt@d%xt5i}YB@XsDJKLR=H4{~PVBbDdL4i}RR}Bv<qRS8+{N*eb1-ZG?9UZBUA15ty
z-GzB6FSqCAP5J%!fBpNb-n@zXl7dff+h)^hX9z-|*Q=~n>31?<7*kf}$jh5z7%(`f
zeE2Y#VK8W<KtLB3eo!g{I-N5yk+j)jWU|>icUFf3Dl6X^jk1XeiB9Jn7)aQ$<9%|n
ze|&sJdwZ(KBVc3HYTx$l<8pb>WRl&zn@Uk!pN|E+cPlI3f92**zkVGj6w)m%gK24A
z_C8OYdRA04F*KwgN&LcvKi01O_?;w8O@``f%jl@gYL)KYYd(1J&-o%Hl8{_Z(KP1s
z@!f8r%Oz@PFsjvF_G)snzoEhC_3{%F$@+TJ@#D`u9=^dKFDh~zJNAN&$;cosUi>`}
zz=wtug@qqZf1Z5C{bm<1FJoiUGiS5_0KFb$W)cMjlW*Uy*u2@5nMv&4{VPf00Dz<<
zva0HBb8|K{!}|3^aj~Pe_7}Td0st5oNNjEWt+P`-HU=3nf)KQ~udb*VfBIB$?_LT3
z;Kd91mM!)xSJnXlN=qGPv&>?VWoNr%VnUZMXRt3If3sQE(lRI(he#6NvuCusTXps7
zr}+N<gj=`zHf)#~8HrnDFE3xp!^cjiSRx4l0CIAseLj9wm6bgoA0LQ~4bGQAt98GB
zAHzxk0I<h7Inz)t-_q5k-oM}2+Papev62!;SC=|`>D4RwKaGjlStCiD?X9L}l)V%P
z;2MpGf1{TLJV(LcSHT#@002ZHIvC`ILSKHKKUZ{is^`lf6w-kJKKBes;zA+Kv4KaA
zk^}-~(<WDX`bU+@_u#?G`FaC@`Mk!{6!mX!H*RRmW*Ns?Ke`@GOo#yh*RHMM5^T3i
zQc`?4PKQD~_JzG_l|MW_5eWu)Jv}L<r4E-%f7IWfNDzXEy%~+M9UZA0^Uvi+_q)Bl
zD-#mP>gq8*|I@Esp$KR+p80|Y1`_;!eoc)9!x$cqsjanmz4+ju5&%$K?5M9dMJ%V+
zt8_YNVd00Ko)q>B!$1Q+t#RGms$ILR>(+f_r(3IabDvGF^YU$Zc71g^MMsb3H#Uw`
ze^*;(XL%R~&YjD$TBV=kvHyIWqVT4s{KJP06&2$E0Glo5$dP>Z$to^(Oizm<*0tGU
zOeR@cn)k^QWyGG_+B8z>?AfzVXc`lVXuDl<;J{{%qkt{e_pots6pk})w~(gc`;ocC
z#!>)ab0378H~UVU$Tb+`5kK49JZ!N@e=l9i;Mf?B)A8{XN#fy64Hp(|zdJJ{<Q_~A
zUj@tM)W}F27b%&UM1KC%`SV%aYlT8Qr&G*5o@LSIWvMABnB2Pcue`je>(|$`wP}{R
z9G;$@zSK1qg+KuJdil3+Yx??<m!aIx{&!=T$w_f<@5*H>hyE`G2YG>myud+Tk+T>Y
d{2c%Q|Nmt?0EjX3T?+sJ002ovPDHLkV1kZ}igN$}

delta 1323
zcmV+`1=RZH3hoM!B!4wYL_t(|oa~udOcUE1z|VAMy4l*&mgV0?p&(27a}Cv83DBsC
zL=A?-h$KYB2NM$$c{0Z36*a{8qAw=mo5m$E@?uc2Q8a|a1w;gw0xh)n+G(LJly1{y
z=7u}kYxD?1HC}FVej%lq`S{M)AKzI9h;7@p0mL^5{_O%*D3Pome+PMigS@~&Uf|$H
zqmfTsbMv@Bz<NAVo_P(1P)p0$ix)WnfE_zrI$dOHN}fS|B2lWT$==W~RZ=oLIGCM5
zhRopGFJ|+MRvY1;SE-EG)>7R2($d+YqPdL91N--nZP+klwdzJkRhebT4B}S~mH{SH
z;NCsM^XECgc--ZAf7!g*U0&{|Y5d8P|Ba6;xQjT>)Ybi2Ts#*JlRZ5;mrJ%t1`J~@
z7OJAc&$8h4YjuBrF3V!@$_QrDCT~_2Z8p!S)iH{a%4EsAch{r?>g%0$yL@_DVm8kV
z3~07*|3jmRy4|a~yA9zm$;D{3k-9pULXoiB<qsYh5(&QZe`6Wz?yg-<lPO@cDM*rO
zZ+~epgt^ao^5jr;wP$!(6^-I&&pyx3pI;<NTia-3qkVEx?sUqUo5v3x{P4X<u{fnr
z#90=LMu}ih7zl`3TWwlxn7f;u9X)Ws7KspQb*!aj?AWo_;V@ydDXXigqeq9in1X^}
zN5`{x9Dnmhe^piGJ#k`)|A$>hzc`(;OP5Rl0IL-kjX|?{+T~hRS?MzxgNF}WXc`9q
zXf&~ghN+7e{}0VjSQxCSq1xJNyj}?aU|=Bo!iD~x9=+2EX|Yg<?CxH(bEj)~Sk>FB
z1pvH#tK721ef@e70Kj6Q91i)^l)SWbRxD0kyS8p*e`H|+ayaDe?Jq^56iwsJ%@bCu
z?#7LxzsJ&CzWlVfc+O^1{A4fh-YL`X{eH1Tk^%sfl?9?vqM>1uyRKByGFjq#8A?iK
zDN4#o0RXt&QjbScRu+JI`Id(d^{uV8n>Py?2CJ>5dV2KfTkqd1KNltf07xVYUQDJy
zEJp0ze>=h5N+fW-KE%_@GUm}YlamDi2!%`{AxNb@eT|H$zAX1ENRr{&Dh*BJLLtMm
zfM?Hg2!dU|-nVw`d|qCpuP-lsE1CRM8_RO9pK7D&e`@RM%AcI%dsg_-{mADNV;Hz|
zr+`ne$0Nzfi3kJ?!w9&QH8(e!Zl5JdCI!8{e_D%$^7};t1KFVvxp@5aw0L4-_5J$>
zp83DzN6))`eR(QXY|kDCjxYS$v$AM|A@sfA!9h(dMl?0qF^m-m*rq0XG>X4^r3L`h
z)KL5OjV(Ex)v7a_XR4~aj~{EfD_n!5!7%Q1;oGA}y4|}c3kv4B{h_2}mL&Q1=8yCX
zf5y${j*iMhhu$?d+PP-#>@5AfRe!w!$K&{!GnGe<jMmq?00199N>87zjK^_q9SsCT
zOAhIFOYL^KULPJBQZE_Y)s-)mCfnOzFbqbLjMpnUe*AZyTQ&Bx{tqjc#|eU+n-ek&
z{5<kiFw0_JPK3_Rr{~ZA_Thta$)7!Sf9jRXCA)fc9nZpWoKYy^G>xYZHGKGK=iT{v
zVaCC$SI5W36nvx<76vOS{8z4&@*gXe68QaM{_z|u;yEA~6rMY`e({)%8>hE!{a9Y^
zzjdpS|5BYXE5ZvO91giqn0x!S(c#GCxqP|&XT11);{N`;Up5^2yA&Mc1rG88k+c^c
h2YG?>R{#J2|Nl_<1SEAayrKXA002ovPDHLkV1nq>m!<#!