From ffeca25f115a57051c7da3870bf5d17a1b81b643 Mon Sep 17 00:00:00 2001
From: Andy Williams <andy@andywilliams.me>
Date: Tue, 23 Feb 2021 17:14:49 +0000
Subject: [PATCH 1/3] Add calculations to apply hover over high importance
 buttons

Fixes #1785
---
 widget/button.go                              |  14 ++++++++--
 widget/button_test.go                         |  25 ++++++++++++++++++
 widget/testdata/button/high_importance.png    | Bin 0 -> 1251 bytes
 .../button/high_importance_hovered.png        | Bin 0 -> 1263 bytes
 widget/testdata/button/hovered.png            | Bin 0 -> 1238 bytes
 5 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 widget/testdata/button/high_importance.png
 create mode 100644 widget/testdata/button/high_importance_hovered.png
 create mode 100644 widget/testdata/button/hovered.png

diff --git a/widget/button.go b/widget/button.go
index 5c2ecbcc37..0a1f2cf394 100644
--- a/widget/button.go
+++ b/widget/button.go
@@ -312,10 +312,20 @@ func (r *buttonRenderer) buttonColor() color.Color {
 	switch {
 	case r.button.Disabled():
 		return theme.DisabledButtonColor()
-	case r.button.Importance == HighImportance:
-		return theme.PrimaryColor()
 	case r.button.hovered:
+		if r.button.Importance == HighImportance {
+			srcR, srcG, srcB, srcA := theme.PrimaryColor().RGBA()
+			dstR, dstG, dstB, dstA := theme.HoverColor().RGBA()
+			alpha := float32(dstA) / 0xFFFF
+			outR := alpha*float32(dstR) + (1-alpha)*float32(srcR)
+			outG := alpha*float32(dstG) + (1-alpha)*float32(srcG)
+			outB := alpha*float32(dstB) + (1-alpha)*float32(srcB)
+			outA := alpha*float32(dstA) + (1-alpha)*float32(srcA)
+			return color.RGBA{R: uint8(uint32(outR) >> 8), G: uint8(uint32(outG) >> 8), B: uint8(uint32(outB) >> 8), A: uint8(uint32(outA) >> 8)}
+		}
 		return theme.HoverColor()
+	case r.button.Importance == HighImportance:
+		return theme.PrimaryColor()
 	default:
 		return theme.ButtonColor()
 	}
diff --git a/widget/button_test.go b/widget/button_test.go
index d2818ffbf6..f9478dd361 100644
--- a/widget/button_test.go
+++ b/widget/button_test.go
@@ -121,6 +121,31 @@ func TestButton_Disabled(t *testing.T) {
 	assert.False(t, button.Disabled())
 }
 
+func TestButton_Hover(t *testing.T) {
+	app := test.NewApp()
+	defer test.NewApp()
+	app.Settings().SetTheme(theme.LightTheme())
+
+	b := widget.NewButtonWithIcon("Test", theme.HomeIcon(), func() {})
+	w := test.NewWindow(b)
+	defer w.Close()
+
+	test.MoveMouse(w.Canvas(), fyne.NewPos(5, 5))
+	test.AssertImageMatches(t, "button/hovered.png", w.Canvas().Capture())
+
+	b.Importance = widget.HighImportance
+	b.Refresh()
+	test.AssertImageMatches(t, "button/high_importance_hovered.png", w.Canvas().Capture())
+
+	test.MoveMouse(w.Canvas(), fyne.NewPos(0, 0))
+	b.Refresh()
+	test.AssertImageMatches(t, "button/high_importance.png", w.Canvas().Capture())
+
+	b.Importance = widget.MediumImportance
+	b.Refresh()
+	test.AssertImageMatches(t, "button/initial.png", w.Canvas().Capture())
+}
+
 func TestButton_Layout(t *testing.T) {
 	test.NewApp()
 	defer test.NewApp()
diff --git a/widget/testdata/button/high_importance.png b/widget/testdata/button/high_importance.png
new file mode 100644
index 0000000000000000000000000000000000000000..1339bd9cacb28629efe2ab5a5626ae79a3c94bbd
GIT binary patch
literal 1251
zcmV<91RVQ`P)<h;3K|Lk000e1NJLTq003A3001or0ssI2r5HOA000E4Nkl<Zc%1B-
zZActP7=UMHclLHSiWe_>ZB8XQG-<U|O~0ts6p~m?nx-+7LK+$<Btm{!=#SDO6bq#k
zETx2&fYqiSpluRptC*CUgwQmhA!60!uGAdZ#2Ss7SiS7s?Z<3c9aFuk$$fBlCG-3c
z9A?LN9^aXFX76~@Gywwul<WXf1tx;RL{Rv!-xWn6gd{1L#DNf!WqE$f0uhR$jE;_K
znwIdu5)H=K>2%I_u|NbNMANkDldF>vTS7Upc{nWb*&ab*A}CA*g^8dr5fmnZ!bDKw
zDIzZe<z@U|&BiV6N3ytMHPW#fsVIw!*O-YUJ|fC<`L>;sLxK(ow!J8o=Z0TlQlB_P
zyrTd&ZnE)nN>^aevQ2#BRH%JmxjW0d8*NXmUL<!8_i3%3Xf8XLgFFHOEz0*yv5MGN
zBE0>y5I!gZA8)Z`$*`qYUFtzs8Y)=1NIp6w7+oYyTg6f*SKRE6?(yhFKmgt<v+XO!
zOLeF(6S8Ia!THdl|D(FDAfEBiv`yOJM2GvegBLApicUM&MOcx`r(rPoxB2U^LFQg5
zVh)z)aISQy8lZoSc*hL@fZL8La=D-mp3Spn)O*923`Uk3QHtOZY}{nqQE->XYfEsJ
z4BtE*(n)w&ewDUp)<i&12e;;hUb&Y4Xp1P%4euEzwa0_Qe)3=%`gW(}O8+-&8qTV|
zN%GlN5dt9b;PdB20Klv5!C!{-$YvB#?^$FF4^@lhIrmf@YS!@%2_E<{c<-y%A;DP-
zjTh8&L&kv(LggB+VWVw-XJFTQ-jxpjxJeq$styT0=jJ+nx?Kd{4d^dF#D@&<{&_2{
ze3KEsTZ%@6qM3W!0|0=o-7DPo<(BloEmGB{L^^(zo0oYoG;OwCwsy@=yVc4yQbjHY
zA)NhVu5|RU1AXJwI<8n9#uRYoswF}-z?c0??n=uOw>sB7LayH?v%6raGp4GXla6M7
z!tU2r+-Ve$RgYRd+V*^YT_&o3MtJ>6p}AK*cu^zq_(URZB3k;?<34LyzL1YgD{Zk1
zWz5X$+LYPcx1f%O3~OiEek4${p5I?A<gbKvj|(9k9O{WO3+9uGC!fn>1^_ryf}K8n
zT%oI7<e_GmGKPv~9`R~Nz1k;LQnj0VG~3#$jG0~n2M~nOB}giY=o&OU<D_sE`r#$%
z<e*hl3RfZT1gSq0tb0Nz&*6GTiC;Azd%#*j{gyRwb;_E&jRQw_Nz<zNMZb1xFtVzV
zigzTPn0q?{?N{_n3GON4_Z0DNJDN!oaBYgL%|Ndd^0g({F2Xji-t?Qbe14xWzPe<U
zrIKt^=HiUVKahwiBToORdnRbrxbCM3IpilDK0T~)8FqiaNLjfVFzbE_3LMOmt%K9J
zLeC*zU(#AVx>JTG05=rVn0GvR=jYIe7gW0lM{k=UJ>u07lZf}uh5p;vGh+0N7_kg{
z2h}kDnhu|mLCoPL{7!|;sm0H+cPAB>Mp9rRC`<%}iJ&kM6efbgL{OLr3KKzDaI!=Q
zVT?~~9!_372?Aq`(1Ij@Vc)a7Z@)toF5<q0?GY3vg2F^l{s{m8|Nm<sw$YyKS2+Lx
N002ovPDHLkV1nZlO8fu-

literal 0
HcmV?d00001

diff --git a/widget/testdata/button/high_importance_hovered.png b/widget/testdata/button/high_importance_hovered.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a0cfa9c6fdf3b186e3f33015bf2c92de3688f02
GIT binary patch
literal 1263
zcmV<L1Q7d)P)<h;3K|Lk000e1NJLTq003A3001or0ssI2r5HOA000EGNkl<Zc%1B-
zTWl278^FJFX3oyccA;hICG57P`4<|R{M$;1#idE5K`W$<Eg{Ma3Gz@A5==}~e1JD^
zL4z72Vtg=AiZKmUAGCtR3rG}2BTZXu(YB_twJo$Mbi22iImgWQ^s-A^y3@^e4fA{3
z$?VB@e*1mjoO5<W#u!)t;N=b=Rj@>GED;<r=Cj}Lr<5*JFv$aBY`5EIUx^ao_xp#2
zhE!EedSJ<h5R#LVGuuU!2ui7{s=F?_mm{{M(o*S-NqnnEa4ZoVO9aOf!LdYeED;<_
z1SgRq@>bxy75`PU35&ZpQ)sGFn(CC|Od(NYCX>X7@VLd3wX#zNrwk`*WRE*`3zPaJ
zAmW;J<mHELBH|zI1m4>&9lC&8|6FL#a;QRnaLpXK)6@|@(`9C}BVt4_1T>T9OiLB9
zx77B0If)$<!I7=D)e1V*9-i-uE(a>inB)3t1(}QF*kf{OHujvHF!y!yA`pV-%B8&}
z^Nw(EGs#lWTUSDJ9tIx#CMZS{;#jp(mW@t#YR7*wtOcjCAzeZhd7@o}{yXf-fX;xA
zB4Xsp72FOS)>-E*+C8EJKtVe8xN%T}id-X}j+^@JP<*LjQiOoeD_f<S!h7_^eWhZS
z9UZ<9((jTnp)!cfS&M7}gBsip&fHVARy<NADO1sPjk0IH3J&^cjsrK=$}Y!D*1Yzk
z+BZhut(FjgBEtLIB>-snGIZIi#Wf={BJ3i1yIS_R7S(8L*9lHVe)fED@zuLZ!IKu=
z`9-}vpf@~VtIEfRE2IPG0(I*}mjm^T!K*)noC?}jAfD^fG9>gxkG``=2<h<V&xYOJ
zvAEBc%!u%7?CI730DS&r+S-*1-Ptn+^=INP+D8fmMFj6SYmRiy53Yu*^5rdV94SYG
zHEB@f#GiDlXM2nrM*Q&o-*{({pi=m#bKb7BFbR9kT^(kF6Kt{zmS&l3c$2stMy|P6
zpi6sZPLK$OGy=_C+Kxg}m;o<7L=J2sjUC$YU&GVwV<{v|L}R;pzR&o5b`+A=t87ad
zibm#jW1OAph^q6D4ihTf)#87Az4%m_?SJX8f1?=G*oSQ<vtTx<xbnF+VpO<OMrV7q
z(EzV@SwI?Pb`kkC_UU!?vp>|M+muHO@c*-nhCSJg2?hknT!N&ch;RSWx<<(cCu**j
zzw4)w^*inwp)Xwu?%!nFk}I?gQD2yC%rOeE^Oo`Wym7~vyd=Qsdc_xFO`Yn+{`j66
zskled8Ea?_wD#&w1??^tb{7i;E79+f346y`{z~-324P>Rm?5E-Zv8}?QIFS0^^dRV
z44@<vmAkMW{~r=)_J5x~pKoAbVDYEeFKm{w9b9E&d$@hrh_x(R*i*uL#GsEJ{V5c8
zP*V_$GVLf#VKhLe!^8+>ry&M#bAr+6<%z?FR!L~s&qDe=s-vaS>vFjq4#)JBC6&e-
zb4{{sSa16}u#{n^Q7QY!7ds`&*x+3kC-H@uFKqG&l8U9VELb8qmI#g|f@6u`SRy!<
z2#zI!V~OBItt>Idgpig>@AAcyBnTlGM<oG@dC&5`eTOPm#C?m^BRG}_jwOQgZvX%Q
Z|Nj^;tbsFbK)nC}002ovPDHLkV1m0vVVVE{

literal 0
HcmV?d00001

diff --git a/widget/testdata/button/hovered.png b/widget/testdata/button/hovered.png
new file mode 100644
index 0000000000000000000000000000000000000000..86d641c1d6cb883d5d4bf148d9c8c838e4d1bf11
GIT binary patch
literal 1238
zcmV;{1S$K8P)<h;3K|Lk000e1NJLTq003A3001or0ssI2r5HOA000D?Nkl<Zc%1B-
zUr1W*AHcslk7qg=V=~<wgZ%+z$hMnZj9qLFw%`8TD048knIMksVs35_{V?((y2y*H
zt}-uEh~PyCDy$nRs5}?lq(xy=B(LHrHK970$D=Q==OAUQO%v;7=W}(=bDrnh_xbdk
z=Q+>u@Ct<jumEsRI)T#yD}sR)!N4m!CkP^+&!12-^@Gdh3WdV`B?m+h1cBo?Ns@I>
ztll69B9%(_yEq^spU;ydDV0i3BDcDN<9OM?XXgk8Rs;hpf`Jvmz=~jCMKG`;7-}iv
z?;<q}SWjvuVqsySp~&LmVy$A<liG;DFwA5!rHhzMCJe)B61JX{Z@Q|$=kwWYHj1L?
zQ-UDOW^-Fx+sl_Pk7(82-aa!kbGZEd`}bO{wu&@JlFa3D0)e24wlxsp@pw8rJIe|w
zifV3dP9~Fjz5ZtnqtWQf%F5yLR4P?nCKih&7z|EMPFB~vdJ%;}p{uLQ<MI5gg2UlR
zBoY>jg~Q<-zG}DIbGaM<eEaq-6bk8dy3e0K13>9tnog$!fdD}e*REZ=fB!z0%iP5z
zNn#ili^ceSzEY`_%jE#Dwzd`s1W**6nwkOtrBZp}!i9>uQ>6%sqHH#s&*wY3T3=sZ
zB9UlqZ9Q}5OxY!oNJJkX2m%0S&z{|%`uO;`)oRUTGW4ljF7NK{zH;SCJRUb1jq!NA
zRI{n6>H78S-@ktcfW5svv)K#)PN(z1g9jD$sG7-gcX!upHviHB&B(~e*RNkoUHTnT
zsT6JD%a<>1xBKzq$Ki0;Znp!#(9lpk9=~<#mdoX`+wK1=B9Ta5y?O-zd_MpGMQ+@<
zQE8{D84&`3!0B`XfLg7NL?TDjym|Ac*Xyk`zTfZ9WHK_D?9H1u0PykS$BBuF>FMdx
z3-?$owzRaQ(P*AOe+~d*vH0P`hl7KI2!iNzx+;29n^lA6-o1O5FJGp!4243+2^Eb-
z={QfGJSi3Ca=D$I9j#V7Ha51ryxh^z(bLn@(9rPd)2Gt(aU5zULa*09efkstMn^}j
zR_n2H;{BV|)vH&_79A8tMIzC_z`*eEu-olkU0rp#TquefjmBfAUpo;sM4?d7GsUxK
z&%|OeU6{#a5CkCzLMRk!G#a&9-PqXZ_xtDO=1T5JlFaAx)eVr-C_<%D$>s8JIQ;J2
zJC#aBKffy!ik6lZm&+9h1n%Cwd+yx1+1XiorKE=s0A#aSgTZkA{CS;D_vq21ivH+n
z+<o$Ryx!j47cX9HZf^cnBoc|-zI_`2WHMPK67hPyZnry~PQQNr+F&ry>+9RMZvkL_
zejdZH!>jc#;q3qIb9;L`7K{D<TWp8Jv9Ym1AAk7p;m(~q01ylY`}_OpLa9{x<HwIm
zb1IR|W|PSzpU=N|@nY$zjH0OZ^>q%1bLrBhvJP);ZKcy`i9~{;=+TjJ9GA&trDvJr
ziumtxSj1_(HBJOp1OqFAffd2PieO+xFt8#RSP=}Y2!;cjE-sggAPA1*Czns1KoF#C
zlgcUk&hn4_hN@h|9}7E2Ft8#RSP=~W1ONd4|0B-Qgz(o@ivR!s07*qoM6N<$g0a$V
A*#H0l

literal 0
HcmV?d00001


From ceff3c9c9d199b198050adaff183ff0c6b354a35 Mon Sep 17 00:00:00 2001
From: Andy Williams <andy@andywilliams.me>
Date: Wed, 24 Feb 2021 10:40:00 +0000
Subject: [PATCH 2/3] Multiply hover over button colour to support other
 themes.

Correct, and optimise, maths for non-pre-mul channels.
---
 widget/button.go                              |  23 +++++++++++-------
 .../button/high_importance_hovered.png        | Bin 1263 -> 1290 bytes
 widget/testdata/button/hovered.png            | Bin 1238 -> 1226 bytes
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/widget/button.go b/widget/button.go
index 0a1f2cf394..07e390287e 100644
--- a/widget/button.go
+++ b/widget/button.go
@@ -313,17 +313,22 @@ func (r *buttonRenderer) buttonColor() color.Color {
 	case r.button.Disabled():
 		return theme.DisabledButtonColor()
 	case r.button.hovered:
+		bg := theme.ButtonColor()
 		if r.button.Importance == HighImportance {
-			srcR, srcG, srcB, srcA := theme.PrimaryColor().RGBA()
-			dstR, dstG, dstB, dstA := theme.HoverColor().RGBA()
-			alpha := float32(dstA) / 0xFFFF
-			outR := alpha*float32(dstR) + (1-alpha)*float32(srcR)
-			outG := alpha*float32(dstG) + (1-alpha)*float32(srcG)
-			outB := alpha*float32(dstB) + (1-alpha)*float32(srcB)
-			outA := alpha*float32(dstA) + (1-alpha)*float32(srcA)
-			return color.RGBA{R: uint8(uint32(outR) >> 8), G: uint8(uint32(outG) >> 8), B: uint8(uint32(outB) >> 8), A: uint8(uint32(outA) >> 8)}
+			bg = theme.PrimaryColor()
 		}
-		return theme.HoverColor()
+
+		dstR, dstG, dstB, dstA := bg.RGBA()
+		srcR, srcG, srcB, srcA := theme.HoverColor().RGBA()
+		srcAlpha := float32(srcA) / 0xFFFF
+		dstAlpha := float32(dstA) / 0xFFFF
+		targetAlpha := 1 - srcAlpha*dstAlpha
+
+		outAlpha := srcAlpha + targetAlpha
+		outR := (srcAlpha*float32(srcR) + targetAlpha*float32(dstR)) / outAlpha
+		outG := (srcAlpha*float32(srcG) + targetAlpha*float32(dstG)) / outAlpha
+		outB := (srcAlpha*float32(srcB) + targetAlpha*float32(dstB)) / outAlpha
+		return color.RGBA{R: uint8(uint32(outR) >> 8), G: uint8(uint32(outG) >> 8), B: uint8(uint32(outB) >> 8), A: uint8(outAlpha * 0xFF)}
 	case r.button.Importance == HighImportance:
 		return theme.PrimaryColor()
 	default:
diff --git a/widget/testdata/button/high_importance_hovered.png b/widget/testdata/button/high_importance_hovered.png
index 5a0cfa9c6fdf3b186e3f33015bf2c92de3688f02..ef5bf89f80ba9abeb11196ce1670e33baf29fc63 100644
GIT binary patch
delta 1270
zcmV<S1PS}^35p7kB!AIKL_t(|oa~xyOdDk!z@K~Wp0;-_UEf%tn^gCrIQQZPF>Zlj
zG$>mjOiUyg{Gf&qV`7$l@PkvcWM(lj`yg2~QE)?(8QgS}fKi+-n=Zk)(TNZSZf1^H
zEFCXxuh;fo&DjT}4Iq6<L3h7T^my*y|NZ)ZURz306rceBTz~EaRtlO3j3xp@CB5c2
zPL}0mN+x$e2pNW%dnG{x$8kQNPY{HhCzfjvLQbc1u8RZ_vMdXN@OYPLIdaP>J=JVd
z;cH_AMiYV2L|`-#7)=C56M@l0V6rKq$U+ral9#Ig6|yE`i&J-|!EvU+v3a#FTQPG<
zc0`o9^&L;!?SC}1)3Br7Ugp+kC2TIqLM7K0Ge@f|)QnOiB2GMMKk(Ib=QVDTyAD5Q
zd3fzSwR7APKG`2mBMn3n6eJ=-nmfi!MKqO~4(>K52Zf+zuO;6I+pe$+-MGd~ZnV$y
z?sg{4B5m7e+g_;Ka%?QU+tU|80Pt$Xs-_a-LJeN8Fn_N$l5brM%zGC2a`zM>)jwKm
z?IkXB+!Jo;4FLcm0&Z@h;cmCVq$6%li@l?~JaeRoNTS@WUt=bD5%l}`A-}p;UT34q
z-TJ7gRNQR<0Q~IZrz5GAMw%ihNF1%Q)E3i=H)}36<{RNFUr&p2vJIBUiN^mG6P2ks
zsaI|=ynnOD${-^Ca?md{eKF|`N`-mksd~p+GdbJx(D~r?Nuh0@odAHQi1s=g0HE=+
zi64HCrS?QAwT{Ce_<pUmtY}FiV%`0;gMrPRQ%mo?c7}{wc>7Z5(yiD_51A_08xB8e
zdExBDQ=6EzW^!agJaj%_qhZwsx_cyIHNdk&Tz~y$CMJR--v<By*C)kPA1WOYoFF%z
zo&W%R_ndQ`m0YCduM=Wr`*^DHpV(kv5HT8*;-luVAKA+FhH|%_PyzArrPzTw2Dq-_
z2mrtzmM+|k)o*5aS!wsAGtg#d)`)Z2%l{ctKXaFv+);=!301U8m3x<&^t@Owdr?QK
z^MBFFey-*|`d&Nr#v|qfyYgDEur0l;oQ-cJvL@ogzVMeL>gQ8aOz$YPW)e#LyAO>9
zq}INKNhc;LEHCf<*k8AaZYnixv{Cza=EX$t-cO-Sv(KW4EHXH*P6Rdvb`M8yb5i`G
z0TF_vFbHyj{OJI9YJhvU#<pjpVQT@Jb$_RW1SE*`3S=dU_~u4*&@ViYkGdN3&)tXu
z05+{gLw@1lx#|5o^UB?N&ln%#l@gb_9_#n1)@}vV(NRx<&l?<}n0&$${`R+MN^iOn
zcb}rHJbQYwb2wt7VdFNYaT~MVO2x}$G$`I<C7;>KG?yB!H2mZj?t{x}_qpa5K7YE(
zDF8fJfOZw>#nhLV#N6*bS(f#By-PpEeyw6vfeFtVt$pm(F&+T0!=-zEJC5KDNk=XQ
zQch|H9ZBRHNnTQJho#vpNk}+NP*K2mSe6o(CuTjg&~TiUqT;{wj-G1P<#L%!|2%0%
zUE|FQ^E_mqm+$jVW)gN5UQ+%DCU36@Bw6tWrFq*2V{$N-=3ZkZc8z606M@l0U^EdJ
zO$0_0fzd=@G!Yn01SVl+2_ZxX^;9o-;`+Y<Ap~JU5fDkgv%F(}LzOJzjzt?IFq#OA
gCIa(U00030|A39SiLbuvrT_o{07*qoM6N<$g0z`fI{*Lx

delta 1243
zcmV<11SI>43hxP!B!9L^L_t(|oa~xgY!uZSz`t{5&d$tsp=IeM?6#%(7aE%U+e(PV
zrAehhE2NDrA<7F0@=y~JOiWaKfH!YJgBl}Zd@xXoF%4B8w1UJ7NEAgQO<Qcywx+VR
zEwm|gySJG+$ISNhvP)aK)6I4b^LyLL?8$e2`+eV>b9O|=7=Ks*;N=b=Rj@>GED;<r
z=Cj}Lr<5*JFv$aBY`5EIUx^ao_xp#2hE!EedSJ<h5R#LVGuuU!2ui7{s=F?_mm{{M
z(o*S-NqnnEa4ZoVO9aOf!LdYeED;<_1SgRq@>bxy75`PU35&ZpQ)sGFn(CC|Od(NY
zCX>X7@VLd3wSTfx2B!=sYGjW)b_<jGBp~9Nb>!uTZ6e|y?F8Q2E*-jnTK`;V&vK|j
zesIkkxzp4UKGS7pvm;_eFa$J{=S)i#vA5Lrd^w376v2_Lw$%zc)gGSji!KK$%$Vc)
zY6Y2#<k(|!X*TwpoG|xw^CA#}=gOtMCG(DOa5KqL(0^N3LUSGl9{eUKMiSy!wNjRi
zPIqd@e>1EFr?MekLKS(UU4;HS?8<=7fR7?#<jED>4jk55=PlYjq60udI`+76P=ktG
zBc6_%`t4ABsbNxtfY2*jrJBNf^u>LpVwN2pz7W#yk};t&h|F1wYyyKC+z!s%Q?*t+
zQY9%<(SLP~vS+>u4*F=012@*nF2_vPy!NBoH%8yBmJom<!u#7L0BHC!blI!LH6t@3
z>>_%*TK2dW)o5$i2~I_R_Iz;h)w@c;lNR3jMZG+rH#}gg%EyN*qyy&yb?Zf!1NDr-
zt3QOC3ffj6p6k;xB=kj(zOzUO>G0;yhTYz=xPQ-<%!u%7?CI730DS&r+S-*1-Ptn+
z^=INP+D8fmMFj6SYmRiy53Yu*^5rdV94SYGHEB@f#GiDlXM2nrM*Q&o-*{({pi=m#
zbKb7BFbR9kT^(kF6Kt{zmS&l3c$2stMy|P6pi6sZPLK$OGy=_C+Kxg}m;o<7L=J2s
zjei~5@n6H!?PDn<OhjY5dcM#2eRdR**Q;zx8Hz^cbz_{J>WHfIkPZ_n-PPiMe7*Qo
zneBh+uz#Z%)Yyk@CbM8RskrjFHeyt`Q$}Zdwb1~tc3D6gWp)wyHTLOs^|L?JquZ26
z3-JH5jD|hgj0pw=$XtS?qKI$*(z-^;27f1Nu9v^-r;+tL?i!&lT?+2sWZRM}v<*>T
zm~G543b6B*@%X%P$C$h%!0CF$7h+AF>c#%}o*JpRN75N<XbrUX>P`jiE*5qd3k56D
z?~w_6$65YL^uz{XU#XZOp_Xp_M4M5M*GKh_ujve+Bomdpupa*(5@_~+pFW>&V1Hm>
z@u%1?Y?iVeTxDZ>xP91&wJclMQ^I@1ppPE?DHL~5QxJ?Y?I=uPG(e}r#0X`lAqH@B
zg3;*ZiNl6gNod&5Li#<bqova8a=9E1$MlsYmBt%$O|orRZ~Hp1lwqe)Df`D4J0;54
z;9VCd@r9W$Z1M?`ilwnESRy!<2vm+Gf@6u`SRy!<2#zI!V~OBItt>Idgpig>@AAcy
zBnTlGM<oG@dC&5`eTOPm#C?m^BRG}_jwOQgZvX%Q|Nj^;tbsFbK)nC}002ovPDHLk
FV1k#@WGnyx

diff --git a/widget/testdata/button/hovered.png b/widget/testdata/button/hovered.png
index 86d641c1d6cb883d5d4bf148d9c8c838e4d1bf11..8a0effa81e81a64330c16ad09500b3aa6104e498 100644
GIT binary patch
delta 1206
zcmV;n1WEhW3CanOB!7`fL_t(|oa~xQXd2raz(1|yRFTqFYOSTv2iO+-*mP0oLJRG`
z(oJh!)Y438g*FQ%CS;KW++>kpAPU(8%_=bv2!9d+26Sb}!ssF!4Iv`rVYrMF6OE8$
zVjRa@t}{qtZgcAclY2YARpvW$PQLTw%$akJBRD)f1P%cHS$`*RUf@Kqa3WX)W!EH0
z77B$kN~Uq}`Fychd^B=Q1WA$`8ygfwH9WCKgCNND>(`IEI3}V{C{Pq7m&?y0w}wIx
zMA^XS<_H!}1PdpEg%iQTiD2PGuy7(+>M7!nB6V!Ak<?AZ($Z2>k!UnpuQnS=eME#p
zA*0clDPlAlLw})AU7Bqq<(sZ5@Or&gtCgl{=8_~ylgZT6)1%dDPpQ@0+dDr$e=`30
z^Jl$YUqu=eMdkB(kw{cU-8zVHyWI|lqbx|%bZ2Mh=H@1bVLz*g<M_(T%E@>-ovtpE
zmX?-CBoYV&s;gd;2#3SrcDsL8YPZ`{sZ?ug>))2zY=1Upn`^OHB9X|aPoIAL_yGW=
z9bqPu2?m2CN#443>)Eqsd_MaWQxp{p1`~;dP$*QXR7#~10M^#lg25n)qKpWYN_F}2
z<%;@Jr3jj)tyZho>plIp;o;$}t*!3v?h6+#lod%N5;g<DUpb&CdgaQMQt8ahOjlP|
zHk)NGm48a*z`($b8#f4o`1<uLK@g=oJ32aU-@a|JSODPQ;J{=u0f5u#eE$4-MLnu!
zvfSU_H<?WTXn|pRdfIF@m%8*Tq|<4}g4t{y9UWDx)v;L2X0ri+$KxRg;@-V`LqkJ-
zeSQBcB9qD9zI_V-LZPs;$elZPD(zG?BSIt+Ie(o_0C@NAT|6E?<<7fz?@mrmR@%Pb
z@6Tql3Wb81HNSuVK07-b2n0$8?l_LeVlkag_vXzT0FX+hFJ8Qunwmlo#9%N~(WCmj
zH5i^geaf8ZBoc{8BvMOL%&H8>@s}@OmV)_wes6D2uh;v0zUAfR{{H^K!9fhenwy(T
z(|<=T)J+72VXt1j0sx=SSEC4K*0_1|X4y*zMNx@FGCn@;@p#;B_v-4Z%jLRw@#42{
z-)c_3ej@6~g9i_ond0^9*HWpJ31+id1VKoW6pO_=o$men_wDWNe!qWVVWH%XqNqZl
zP~8AIk0LZ0jZ&$M#bO47L8H+CKr|Y?e}DhJ)oOLQTyt}CPo6xHNF?EK7yuqUdc+JL
z0LbNX7=~TCbje^asMYF<{^@z#eF_8um&>KqYPYwy|6e2?k3W3)5C9Yk#rpdC#KgqN
z$VeuW`S9VxmoHzK_v^=x9|2%-aWNDMF$1I`ct?Nx+}+*9as1a$vF&zyGMQxlZhvZO
zdi?k?0EENgv9U2GD3{CI+S)43sYEW9OQljmq44U}t2`c$3DPv3OeT3e-nDDj%9bZP
zJ3E<7MkbS?D0+I!1VJbiiqcx9RuTVRPKr2>kH(q6iD2PGuy7(+I1wzI2o_ER3nzkw
z6Txz9P0r`@5d=AU5cXdML6EXdDlf0>JImkp8>(^<zb)Jx!NQ4P;Y6_f82|wP|18DO
UegB#o*Z=?k07*qoM6N<$g7rL1A^-pY

delta 1218
zcmV;z1U>u83DyaaB!8VrL_t(|oa~xkNLuY5z`r_=XF3^UGTj`5{Q+gjwwqmyU2G1v
z-~QYvb1=7=Adc-~Zf+3$F!Cb0$cwD5GA~nz;6(^3tQ#q)JQv-hMPXDVui_~+p*oqz
zqc5-LAZ4sg6YFK?b9K&hp6A>5`ShIUInVL%3WWl&0B}z_fq&BiD}sR)!N4m!CkP^+
z&!12-^@Gdh3WdV`B?m+h1cBo?Ns@I>tll69B9%(_yEq^spU;ydDV0i3BDcDN<9OM?
zXXgk8Rs;hpf`Jvmz=~jCMKG`;7-}iv?;<q}SWjvuVqsySp~&LmVy$A<liG;DFwA5!
zrHhzMCJe)B5`VUylyADKz~}SXY&MFb=u?6q%w}_2TieT*FOO)|-rhblGjq87{rmS?
zt+t9ZNRrIuasq*%incWn;qiDnJ3Gq?DT-=tZcZkXdcFQ<4WrTM%F4>&@>D8ST_zTb
zB^V4&PEJ<Wym}FZLZPdx%j5C<tb)VgNF)*#i-p7C9DlxQx7%~M8~}X#_AL|&>2$i!
zpFaaY>0g>orvrfiK@iujUAuq(K9|ef#Ux2$7#54g_<X)nsg%p*0I;^U76=4T6rGxy
z0sy5_dEvr^in>#!2#TU?Hk;4qJGxq5Utc1TXl-phbLLFhC6P!(A0P+<0B6sh-JkmS
z__)<-&3|Mv^r>7f@9yrta^*@q9yc0|@p!ycv#F`+`t|GIzkdgSy}doN*$e<qr}M#s
z2Nm_Gn#po^ch_t-|Iz}@$jHdouU|`D`W;fK6m8+lmoIL&`|;z);c(b)w*$b?&`>-c
zzjf=D%jL4$?f)wxkw{*>dIbP{KL7tkZrr$0X@94x84&`3!0B`XfLg7NL?TDjym|Ac
z*Xyk`zTfZ9WHK_D?9H1u0PykS$BBuF>FMdx3-?$owzRaQ(P*AOe+~d*vH0P`hl7KI
z2!iNzx+;29n^lA6-o1O5FJGp!4243+2^Eb-={QfGJSi3Ca=D$I9j#V7Ha51ryxh^z
z(SOs^)6mfH>C>mu^l=<&CPJ^*KYjWX07gegtyb%?a^n4))zzz4%N89JMMWafz`(%p
z@UYwMUR_;vxm+lU8jZ$dr(Zh}HAJCM&@;ueXV1i9F<qF+WDo=)2tp_nYBU<PTHV;#
z==b~Q=H^Q7NRrIw^VJQI(<nlvQpx4=aDO=b?%g|;N<}}vD-?>BmKK-G6$k|G-o1P7
z+_~A=S$d_UhYtW`vsr_|aQ^&xolf`Y(W8p~=xN-2@_4-7-rg54UTkh|{#7IriQK+@
z8vtZ7StJtidcAJ9JDpCye*M~DFwpDk+qZ84V19lc!?44v^)KP<|Lt>odpj13{eS*j
zY=^_Kv9UoPfB5j>&Ye2|5DW(U`}^rasZ{#o$B#;LDv`}*lgT8X&%b!_V(F=jqNw%t
zbq<Gf>C&aL4sUI3rPFDNM1rE|(UEZ+m&s(MXPM)Q`0sL9#A&=WP6Sp211o}o6~VxY
zU|>Zsup$^(5e%#dh69@}E|-fS2s@7BCzns1KoF#ClgcUk&hn4_hN@h|9}7E2Ft8#R
gSP=~W1ONd4|0B-Qgz(o@ivR!s07*qoM6N<$f=D!QcmMzZ


From 9145c4e08711e58da6787250533212e008cea40a Mon Sep 17 00:00:00 2001
From: Andy Williams <andy@andywilliams.me>
Date: Wed, 24 Feb 2021 11:19:49 +0000
Subject: [PATCH 3/3] Fix impacted image

---
 .../testdata/menu_bar_hovered_content.png     | Bin 3838 -> 3812 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/internal/driver/glfw/testdata/menu_bar_hovered_content.png b/internal/driver/glfw/testdata/menu_bar_hovered_content.png
index 05694113557ee1ce0f4da15723fefdd3be457d15..fc5c0c3a9b78d850cdff31f6509dd9fcbb54c28d 100644
GIT binary patch
delta 2987
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

delta 3013
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
Hu0mjf6mU&`