From 431c0fc2057a181cc6e166ff64cc7b5dae1e471f Mon Sep 17 00:00:00 2001 From: Kurt Date: Thu, 30 Nov 2017 20:35:45 -0800 Subject: [PATCH] Fix hover frost missing pixel add alternate coloration for a slot that already has a background color --- .../Controls/SAV Editor/SlotChangeManager.cs | 3 +-- .../Resources/img/box/slotHover.png | Bin 1301 -> 1302 bytes 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs b/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs index e04d3fd64..856723911 100644 --- a/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs +++ b/PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs @@ -4,7 +4,6 @@ using System.Drawing; using System.IO; using System.Linq; -using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; using PKHeX.Core; @@ -48,7 +47,7 @@ public void MouseEnter(object sender, EventArgs e) if (pb.Image == null) return; OriginalBackground = pb.BackgroundImage; - pb.BackgroundImage = CurrentBackground = Resources.slotHover; + pb.BackgroundImage = CurrentBackground = pb.BackgroundImage == null ? Resources.slotHover : ImageUtil.LayerImage(pb.BackgroundImage, Resources.slotHover, 0, 0, 1); if (!DragActive) SetCursor(Cursors.Hand, sender); } diff --git a/PKHeX.WinForms/Resources/img/box/slotHover.png b/PKHeX.WinForms/Resources/img/box/slotHover.png index 7c3f943b2e7ac1b40f0d0b9f807fbce427dc1aef..dd03d46c4f0ce7e88dee8f70986ba9a335ac5cdc 100644 GIT binary patch delta 1101 zcmV-T1hV^;3YH3xJPN=701m(bYSxJfkwzzflu1NER9Hv7*y)m0MGypFMMXtW6h#41 z!41I~7i5zG7X&v};r(A_%8yzPAnVE|}G9d1BS7l`_-F;rz-rjyVImcY=3k`2B;x8pM$-Q9+&!z6}UKh~EN! z?*zzBys98_e)PwZ6QM}I3BC$G3rg;IfWVR9?cmMejTr}K_`lx|2i6@8kQLa+fnWtK zcp?zv=ipW#ixW`#4%4+Y3l z7g2#yll{$rlGg%hUy(!*IcY_X%-4fU0r{mtq*7C2RH4xR00}mph8Kg8sKAs1l2wu) znYs{2xB5r)CIiU*86a2nG=)u+qZ)$@b3ic;sl@q`(BoiT6&0KyDXBJa*rS1rpBfBdR@8JtMkD7EB7j(Xn* zRS&tQbuZ)!`_!xQsFLh!I`yb&loll~2U|9E-eHY>)f1KIL^(FYZpjt)3sk_$MygA& zwW!2o^0Eyjhc)&_in^$JQag5k>eAtEzz%!tvaf{r|vi&5;y^Xmo9B zPY13;y@DN0!!G+{EgCyW%H)Q{I#<4tGmq4P&aHZCMM|D!r0fJu^-@LRI27a!F8!uw4>SYY$S|hkcuk>6=jdJrWe6w_pX~Dd&-9WD#)*Y>CvUMXnA^xj8B@>^rVjyg9QDry+g zjwCfp2R5TiXFJ7Md&Y}rfcJ_gfB~%!a3I(v8{GeUlSXp9O{)o4h0Dk~W}lLdHC)w+p1eY6=JOm&jy(Fi^^aCE#(~|)YcAzA(eV_E{i6kRS zk{of!@u+CY`qz_w1Qr6f8IzU-Q7(%NNToH1fqgobaz;u!mOs5fB%eLPXZyjw6i0JI TZ4Ded00000NkvXXu0mjfK9Uc9 delta 1084 zcmV-C1jGB53Y7|wJPN@801m+cxRGn^kwzzflSxEDR9Hv7*n78*RTKqqN{Eu&qLRw3 z2$gFgx8xFX()a%=$NW9xo$uJ=8I*Ip`eP2f_FikQxh{L}XUqEf`ilkr4xR;%gZsg) z;6`vI_$fFWoC;0`UoUVp_;P_S7VsNV+p z3!VoSKMd{$zXlhBbHR7P@n9r&B={^ixWK;Pzyf|h99V-mk|iq0Gr^Am0SNJX!0*!l zS$x*2pnv$$f0mpGMS3ClJ~$DS+~)xT`-4w|J;Ck;b}iuVe%~8dcPKzsV8;T%3R>_) zAja+Bk3beDq6kv0sU`QFU{vmO@NK|TF*4S4)QHf5JV>4`)Tw%XJ1*~kOx&&K` zN=zoN*-&y=V{fFWi>fEJW2er49c~8fu*WX@N{Byx`8UjwylAo6BemKbNl}PK*S7X_ z;40KB*wHlXvOm_Mv4f;cp0ilz$~SW6kvh=1RZp!*$(xLnji9NXt4JJ&0v=~9)Yc`Z z)%~ZM5Yp>EL} z)I)Ntzg2ec9PBBZrnuwA$LIkz6oX-ce z$lkSr2=-JdK`KrqXQA=p^q}BKup_1fS2Y6*1l6`0?1|!R=3k1J3K}uJ_fe6&7Pd+L z4+UF?I+=p7R1iUF?wBEe@0_4W-{uT{6_D$gX_N44#87aWE*82ZbWryWs8Q6zcn+_! zQL3Ix!&ra(I_3yPw96K|pgQXO(3=d2I}2NftDJ@NvzVWr#Xag|^t{E6IyV|BY8cXv zBsEJ1HluTA8^u_A#*1fw_lhTg0j&>kAlOwK-2Z!%MsmDOs|kfx%g8EbqJ1#$-ku=* z%A%&l=cY}4i@4ROM=JKxFs8aHGQL@oV`^J_4uz_x_VfbvmN)7@gTCgF?BzkR+T;rK zy1DqKB&};xv}@Vx6{`;?+3TAGmwS^v1Rw%ECzD?U6$^8c9C66;sA$Rh)02M$76MNg zla~ZhE{P0Cr8S6weL9wMMoK%DKfORCpFP57eeEUEOmgeYW*sd60000