From 63c3ea26345325134a9e7db0ad6bc73cb5a95852 Mon Sep 17 00:00:00 2001 From: tao wang Date: Mon, 25 Jul 2022 20:12:22 +0800 Subject: [PATCH] FIX:fixed taskbar icons being too large on MacOS Change-Id: I696a877bb62106cd3b6530fd78810eafdaec79c9 --- resources/images/BambuStudio-mac_256px.ico | Bin 0 -> 3063 bytes src/slic3r/GUI/MainFrame.cpp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 resources/images/BambuStudio-mac_256px.ico diff --git a/resources/images/BambuStudio-mac_256px.ico b/resources/images/BambuStudio-mac_256px.ico new file mode 100644 index 0000000000000000000000000000000000000000..fa9c43cdea4336acd7365e76351682a230d8f2ca GIT binary patch literal 3063 zcmeHJdpML^7k_6M)iCHQLNXI4w+08tH4GvY(G`JV5e^Z(iJv!A`z+P}5;+H0-7*9!n3@h52@ zKn3_93joSuIvs;{fkD-vViM-&>f|YzmGt#8;=%94O|pcG^mK6qDqGb@#f&t?!NUOn z7paA>8#)Bml_2kaSRe*v$X{kUi<<TYt_R`;K+#Ek~^_NzF_al%DhpD8Rz)1CX~F4Lre6YqPeJ5>Dh`y0r}T zV0VU5b3*DJ#{FK~q29=;W|*(GO$J#-u_kO5P{nHpe@5g#! z;wi0lr8%55A_5G)!l`MeEf}I7V&(4bp%cO#E~x`R!5qdO4L1;b2Obh^kSg? z*GytTi{rkk7YgOfUBkshL5|_9%=X8=LT86oA%k3AqY>Vj-)JGjP#%mRV(Z?*BSLMs zrPjDbt=23CMyYv)7FBV){AVVLe|RvNpcE&Sv%K*>_BL2D2)e-h9;{cmQ-07X7sO;t z*&CXrMfLeN=eX0?z*_vn21YU`rWGP=#p6uKGul{Slv?c!Ji@dBErnar3MFT%Zk?|{ zv0)+T#Wte-u1B5QHy$|7)H^1)epM5pS=q_At{qvIW}+@8kNOaL+r2(0M%-5xg1U!s zsk_-79Il&!P_z+F>4|Tn|C{YqB^5r$FX?%KTCzDK3`1R1t$Wr)|5&J6@??uqfXvRG z;m2_2^jiaSqCskNT?5LHl=|h{)aB*YMLI+C4-~-Q_ zuK|q*ok6EZ4-`wt-Jk%6GbZQ3x(bl95T!8$%mzX-TnT%4JYfah{6RdhR72zW{S@2@rSM3#maf(tF_(WPyI{a6q zwRGwm`7FFc-Xh=8&rDaSfUYj?2`Dft*6e~3Y*YP|PJb5hay2A5NiY?&+`RAfz_g!8 z7{u)9>|cHIJ{NgV+C&=xa727`q~dH6tP6v+rjcg|n{@0ZnYZIz?Z)fjb>a z8qSeLkUIy%T05^Cs`mt%ylV7aC1Mq^Sja8g>KoEgbI6JV#$hJP5Vqn-5%s7ZfmQm|+6Ee{Dia!W10cjZ=!=01>gN51kkmop|`t)Sv1qOGUS?mG%4oGulMm;oSm za7{%@Ay}nYVrK725RxpsVK_}>wv;9924%kaCU$FRIgol~V$h7wA2`a)TFgEB1Fe1+ zNX?%ZG$$;9TTM3Go3xiW<}SPg(;QIC0(y%2yJ@uy9^L`;lc~f^x&bxXdeWQ{2Z5Yz z{=TXwU~GyaF3ovcNxwmJ@CN*4U+hL=Kj}E4)GDkvS;V2 zj)|!}2l)e}4Z&!vCf;WIn6>ozSp5A)xPdODeZP$VfJp!Af_vg(K$a8(eP~fZ@3#_N zW$$vR(GJq$+xDq-0ygu_gqF%vTqVC zrQ5t~`IB)`2%6;T6kj`h4Q?xw?|~mXOS@?s-$B=qV#!lkx$P;>629fUG50ai)$Hpy zx^CbUSAohZMK_5c`7(&g8}DZlK{r6O^7~woNO2tMv_wrqO}J#}g}f+5IFT}8aV!Q^F@)L` z&4XXB!Vce%j{l&W%_cXV6Il_=sILRnrF?%@#_I<=MLf#3yvA&DJs_p=w|;H`K!!pYsbK{< U6~qR#*hqBUoY78|j)dg@0Ga_7NdN!< literal 0 HcmV?d00001 diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index b46923093..cf19e139e 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -206,7 +206,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_ default: case GUI_App::EAppMode::Editor: m_taskbar_icon = std::make_unique(wxTBI_DOCK); - m_taskbar_icon->SetIcon(wxIcon(Slic3r::var("BambuStudio-mac_128px.png"), wxBITMAP_TYPE_PNG), "BambuStudio"); + m_taskbar_icon->SetIcon(wxIcon(Slic3r::var("BambuStudio-mac_256px.ico"), wxBITMAP_TYPE_PNG), "BambuStudio"); break; case GUI_App::EAppMode::GCodeViewer: break;