From ddb7dad41dcdbdb534261c216ec8772e5f6bb833 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Mon, 24 Sep 2018 12:05:45 -0700 Subject: [PATCH] Revise icon sizing - Issue MatterHackers/MCCentral#4182 Inconsistent icon sizing --- .../View3D/GridOptionsPanel.cs | 2 +- .../PartPreviewWindow/ViewStyleButton.cs | 14 +++++++------- StaticData/Icons/1694146.png | Bin 1170 -> 870 bytes StaticData/Icons/view_materials.png | Bin 735 -> 708 bytes StaticData/Icons/view_outlines.png | Bin 851 -> 807 bytes StaticData/Icons/view_overhang.png | Bin 788 -> 764 bytes StaticData/Icons/view_polygons.png | Bin 944 -> 895 bytes StaticData/Icons/view_shaded.png | Bin 676 -> 643 bytes 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MatterControlLib/PartPreviewWindow/View3D/GridOptionsPanel.cs b/MatterControlLib/PartPreviewWindow/View3D/GridOptionsPanel.cs index 074a00b09..72a8a6adf 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/GridOptionsPanel.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/GridOptionsPanel.cs @@ -45,7 +45,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow this.interactionLayer = interactionLayer; this.PopupContent = () => ShowGridOptions(theme); - this.AddChild(new IconButton(AggContext.StaticData.LoadIcon("1694146.png", theme.InvertIcons), theme) + this.AddChild(new IconButton(AggContext.StaticData.LoadIcon("1694146.png", 16, 16, theme.InvertIcons), theme) { Selectable = false }); diff --git a/MatterControlLib/PartPreviewWindow/ViewStyleButton.cs b/MatterControlLib/PartPreviewWindow/ViewStyleButton.cs index 754d22b88..9dd944bf2 100644 --- a/MatterControlLib/PartPreviewWindow/ViewStyleButton.cs +++ b/MatterControlLib/PartPreviewWindow/ViewStyleButton.cs @@ -51,22 +51,22 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { this.sceneContext = sceneContext; this.PopupContent = () => ShowViewOptions(sceneContext, theme); + this.HAnchor = HAnchor.Fit; + this.VAnchor = VAnchor.Fit; viewIcons = new Dictionary() { - [RenderTypes.Shaded] = AggContext.StaticData.LoadIcon("view_shaded.png", theme.InvertIcons), - [RenderTypes.Outlines] = AggContext.StaticData.LoadIcon("view_outlines.png", theme.InvertIcons), - [RenderTypes.Polygons] = AggContext.StaticData.LoadIcon("view_polygons.png", theme.InvertIcons), - [RenderTypes.Materials] = AggContext.StaticData.LoadIcon("view_materials.png", theme.InvertIcons), - [RenderTypes.Overhang] = AggContext.StaticData.LoadIcon("view_overhang.png", theme.InvertIcons), + [RenderTypes.Shaded] = AggContext.StaticData.LoadIcon("view_shaded.png", 16, 16, theme.InvertIcons), + [RenderTypes.Outlines] = AggContext.StaticData.LoadIcon("view_outlines.png", 16, 16, theme.InvertIcons), + [RenderTypes.Polygons] = AggContext.StaticData.LoadIcon("view_polygons.png", 16, 16, theme.InvertIcons), + [RenderTypes.Materials] = AggContext.StaticData.LoadIcon("view_materials.png", 16, 16, theme.InvertIcons), + [RenderTypes.Overhang] = AggContext.StaticData.LoadIcon("view_overhang.png", 16, 16, theme.InvertIcons), }; this.AddChild(iconButton = new IconButton(viewIcons[sceneContext.ViewState.RenderType], theme) { Selectable = false }); - this.HAnchor = HAnchor.Fit; - this.VAnchor = VAnchor.Fit; UserSettings.Instance.SettingChanged += UserSettings_SettingChanged; } diff --git a/StaticData/Icons/1694146.png b/StaticData/Icons/1694146.png index 60f8cf5f0f9b46861453a88e37160d57b27dbc5e..c8fe99e21cc2f6be485a96880f8f6bfb320da32a 100644 GIT binary patch delta 832 zcmbQl`HXFXvH=5Qage(c!@6@aFBupZSkfJR9T^xl_H+M9WMyDr;4JWnEM{QPQvzYe zRgdmYnrz4{TF)R+;u=vBoS#-wo>-L1P>`6JSE84fTB2a0XQ*eGtTo4*fr06Wr;B4q zg!|j;?%AP^5)BVm9}zn0*I^yo6_NatwJWcA#f^jOB9hiymox5OQGfWJsGwkYlKAbo zz&E*xmGLtg51))V%Is|R^Fia}>gRK;jnnt#t8HC(LZsG!uRixiU+#@AQ;FU;hJx%L z7|ws>@h=pwHeicPmb~|%{7~&0*J}}t-+#0gvCAbYZ#uT$Y6E9vvZ~#pKaZ=L&YqC! z{wQVtP)FqMVXGA0%?~8*J<_&gmoH#hmT~PxznF#ay7s3BgKq3}3+bDeajbxcd(SuH z{oNOtnGH4^*x#M|&w5Y&O{Goz(+llB+&c95N}03pvqvm?2hE-rNO2o*Og$9%u6^p+ z@?V-CZgrIl{54=TPtX#(JyWtQiA}3DxR&>Rpx=7=9es*3`0IDvahvu;cZJBl{N*NJ z3+#6@SsU<2as@6gUvN3TvHL>nv!>roJ9g};Ydl;a=y%jNqT-E5q2RouKJ_77moJ1E zKVA1I>A_dUh?*oREAHhFvNxV({qeZlKw|1*Yni3NZ=0WNo&PhI$69)S_uDJnCpXwc zsp-yL-E?(Bi(k{zs~=2#nw1Nue5$f)JM@B^`hBay`@Cs*s41pu}>8f};Gi%$!t(lFEWqh1817GzNx>TW_ZaPI|1t({|tT zs2rmwN9W@NgV5q;+kgKOZoOPmy(}yJd7^xhRzvDX?k|m#TRy*+SN_x5-F0Nb6`SdE zl-Gp>J?!c`{(4tbSLW5%kN$Fe_y1O4pD=@EZOrzccm9c%)$-JD*z)%HX4{C{R{L5t z>{_QuR({()KVR|TX}{lgQ*75Q^FMu4J}>%Pa-{zElM{N@T@dE0;qr8un=W#Y=g87U zx+^@5>LV`ffAzjt{M|e6Pw(z|ze~DXR_W*3QEB~Tx=gP1%kJ2B27gSHt6b`;5{lY? zOxkU@tG_UA^=eJ!V9PhIwe>owUmsK`Ox@I$DstHU;`UIkuH;VMBUTx58oB|BZrj*Z zUxj2|*m=v1H`u3U)56p|ozu^fVs_|iWQs}UFkEKt*kBSMJmcp)?zKBok7hsVxWhTm zM?ksfN6?}2WA`<;Uyvw%E#$htxV7@*oy#+hshDS1Fmm+H4UYX8t6Fo*{G)Jv1fyeY zW|_{0V~;0UOp&Yh7E5oOe@x_2smY07Vh&vb(T0*j0v$75G=ojjl%3>cYqZkNP5QyW z81&RHv7z^YiiGv~8xqM|Y9fCcJ-*5$(50N@(7c#ALR0fwzv^+hRa&!}R;8Ji>PBsT zGR5?HPUXJEt2$MKPp3T#TeGX8=0^-BT8=2iSi@b17GG=T zx4g8_-R{kY#WGtHe{Z?6? zfq}im)7O>#5vL%dfPhMr)&d3wMl(+r$B>A_Z>R0`Vs;d1wKqK|;j)H>TV8SR0{#hy z+Ba+z7u4x>U9)zr&L@$^FVmbC!Z%ory5t*`A0$S#?_zMfe=IZPQw|fWj?|q?CfpL-o+1VYI}$@a z#W1mcX=J*<8rM+0faT6#P3d*7Lq2!ei_T|uO}M}Fu3Z6xiCSdE)eTXhQFkw#Q~S$N zESIO4R<|qn$HRyBlArxQ)pq^BES)mu7{>N4>jPQ^+HZr(_dd`pom=FrziaVDwrxvu z8Fk&WJDn|a-B)L?-xz54=E{^X<1MqcEL#{__laXO+w_kaHzi(QNx(t7 zAI0~sVczg)%N60X-y6~sZhri^@tO52*2<%{3uOM)F*7atz{(LHks`BTMH&MG1B0il KpUXO@geCxK`x*EE diff --git a/StaticData/Icons/view_materials.png b/StaticData/Icons/view_materials.png index 2cd74d8713dcbf0871855b5338daa83b3205a6ad..b1634a8b4135aa18497f444dac3e2b99d4facde9 100644 GIT binary patch delta 695 zcmcc5dW2Q6Gr-TCmrII^fq{Y7)59f*fq_8`ggMw47#NOh$+4cOCtZJtfr0N3qo{^g z0|NttM2TxeNpOBzNqJ&XDnmhHW?qS2UTTSgiJqaJVY1d7Zw3Y?Cr=m05D)L8Q+z#c zCrC5|3${gg^D}RBwc!mE;cuRM#7Sn6_`z;<)OYJvCh*dzVSvw*$qme%saL?wj&!y$b8Y zYbC*xOXe?HqTuTtJa_J;S@-Sz?Dom63|W=9aQSnlMI5i0=ikWDxOeZLo~?a-b5ErD zF$3|*PoMsLq4I-gk^X^>)2-VMJ+w|aBjw-Tp8nS_-L7jcTVY73g!JT-883DE>igKf zTwK|tF>U>7XQk8kRJEV2X>nrQfB2(&ubo*((#=&`e~RZ!-deA`ZvA)W@g{xP!^KMhtTEn5{;q!jh_3Xd?FPM+l+N@i5&F^oR z_>pyGrE|MB&gkx$e(v70XKxQr6VqK||JBHM@!F+J*^IJeEA#w<4&N|WxPPZ+myt=y zUyWzcYRUgk85FJCAAj!a*OTlfy4`p0s@BwY{o*$F+x_Ll?>D@v3=9kmp00i_>zopr E0GYZ!I{*Lx delta 722 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 delta 775 zcmeyvI)zQIGr-TCmrII^fq{Y7)59f*fq_8|ggMw47#OS#)-7USU|=i`a(7}_cTVQz zL`CWP!wd|3hZ&FOuSj8FV2~_vjVKAuPb(=;EJ|f4NX*PD(aTFMQ83Xn&@(dpsE|38 zfq|*T)5S5w!#i1mb#X#K1p#4ui4j?YgPsQ zo*!6j6xQu{<6eFJx%w4hpAKGnD*ft;>}Zwd;!+>=M_F)AHxAns$|JcQ)7v1e?G0fk!tT`~UyHvD4Pc{AKfJP22X@ z&iu}G-qTHmQBq>|`*~LNS|vQ+%96m<9Z)`4gH0XSb>-y(9w-s1J{cJb9|Dg3)*8JQn8{uRA?8z3g5G>!TUQ-u+DUm@!f?>Ad*W)%H()1V@7#KWV{an^LB{Ts5idJ>! diff --git a/StaticData/Icons/view_polygons.png b/StaticData/Icons/view_polygons.png index 3a13d48f3e634368db8b27057677bb7c97a5eb1f..2705b8699746ef215fd26018075e6b5115c11382 100644 GIT binary patch delta 870 zcmdnM{+~^;Gr-TCmrII^fq{Y7)59f*fq_8`ggMw47#NOh$+4cOr%^9a;u=vBoS#-w zo>-L1P>`6JSE84fTB2a0XQ*eGtTo4*fr06-r;B5Vhxgo2Pmkz8k<#FnN6T(Iy*$-= zn{C%?t-Gr<{5YhXJ&p+Wddehqu^jDGv2cCdqBlqA&Wyz5qe23jVcWSFSv|voyfmG{ z_wIfEsqSQd*kX3Q|Np0dKUcr^{T)Ttp9%T-@1I_}G$}DF>r{ifj#&5JPZ-CZktx---rxA9bp&t^H(YX7C(-bHKOn3|96 z=={d(ZZ=!@q-orWj4w0h%rTidefob#7K0f1Tj$Q7f8DXrc$HE$@41@~t6i6}zfN`D z*5B9n;>V8})22^XwY-@4WGREkkaU0q!}1KVC( zx&Ay|2_7%b`ZlM9{at?jJ9q9}pK-Ujnb~Xk0L~jTyXiqhYuU_c-wAoY>w~p z>hJC4Wsdjc(AU#bc@;BPFn68tjROZ5o)l=V+MRIzx3#r(M)yB1BID!P)T_rSw~ zKiMK@cetEwoiPF$-(! z#T7Pw9dg&*r#E)APg3E2-yw4;k!8hV{^qUQ7PhWmzg|$)5LDDF1AZzS^bc=sSPToD)-C zzj!fWU9-#^m1F1PSG@hnENs(lJlAh&P|)Q+y3U+S)|C6?R?C%@mp5Oy_WpY}&kym3 huiNGOw=8&|e`))=n2U~`LJSNH44$rjF6*2UngAS+o9X}n delta 919 zcmey*wt-!*Gr-TCmrII^fq{Y7)59f*fq_8|ggMw47#OS#)-7USU|=i`a(7}_cTVQz zL`98y$r9IylHmNblJdl&REC1Y%)Ao4ywnl}6FmbxBg2mhnNt}Um=!!-978<3--da6 zLVn*O8vzmj98d{RKN$-fJ&Qp$NIyEZ0q zc8IKwW>svQux81WAf{N$xyEK!Z*On?p|-ZR{It!Hm$J9tRz3CeXQg7P)m(}H55NDuzfyH(a(Vgo6}xv^ zU%YqEue7xE%H_+>1qa@iUHy7$RBuRduyW>A4_mqZC2`g7U%jeVntu9e@afCW z#l@eG|N2#>_%vkl!32R^Qy~cxH?=M07D-#9oNJDKzH0W%z}PrhPg}d%g~ecr_$@tM zU0cPrb1PmwF|;_&w>LccCG+c4*R63eF&CabRb9Jwt>;G-;RDN-FL%9uW#hw#57%dD z*FISE>%fuyX6ELaa{ZUzzI_|dVo?9W*2?Nv%9+<+PYHhhS)-a|T^kV-^QY-rMOm5K z#)zJ6+qS99N)gJ_GO@G!m%`KbW&^YR)v#Y1_U?^6qbYo7_ipP>tI%|p*{^tVGBP+` zZd<+fOS7&0-P^aFt(SPHIK6)TI_RX7V}Abo`EH9O&?hj4IUT%+_^6FdDD;XFV7(8A5T-G@yGywo2eYy$& diff --git a/StaticData/Icons/view_shaded.png b/StaticData/Icons/view_shaded.png index 955485b0442eb569dfd4936d2abf18563cfd9bae..002efac19958b9f468585eb397e9c5630eaf8577 100644 GIT binary patch delta 629 zcmZ3&+RUoh8Q|y6%O%Cdz`(%k>ERN@z`!5|!W?W23=BuM7n}0~$W479PA&===3mzr098FNv>iTZIsJE-DH!O^+tCj1Xpnj->hoFa` z(agwmf{W89UsbdJv*W>;?e)cJY5mXQL$#)^TN{=gy8LqJ*|g%R^De*qqWt@}$<))S zYj3};bJv)_%f@UW!`I=q_^a2_qH~A(!YyR#uD||jG^K8?pZbp)I}R4638$atMcgPn zbSkdLZ84AP?Hn`7Q@w99HU@nCRAF;TPvrM6X0KzH9To=cNY<>^mg^V(((SBUFLs)7 z%A4=M6~(%3H*C4zD!S*vlkHPy`KW!U+UsOsDb&f}9V+Iex~k7v)srcwQ((tyAGOEn z92=VsJ~)=Q{j{^v?ifAAjQgD~kCf-1k2gBA&~5R>G`snSORQS+wrlgdv)nTOx+_A5 zP2yR=-Z=f8aqAoRM6K0`;1H5r9TvB@YRe^_Qs_|cj=O7j#jXF}uqUBar@8Q|y6%O%Cdz`(%k>ERN@z`!5}!W?W23=Gx=>lQIEFfbMexjQkeJ16sU zqM~&DVFm`i!;HuCSEMj7Fi4iTMwA5SrEamT;r({%?ye+9fwsFDn^Pa3HUGeBHaBHnYT~9&u@D=Jrbh`1T3z3*7j<@Z zb-KB6bv1I`6V#um;G^JU;NyFBVf2-^yf$))l7H$S9%nB5dObAu?%JI%m;Luz8uW7c z)vUFzN_MTfnX~Rvxz*gdl=^u0r$v#k%XXJ@ux>h-z|ek}@nXi7xRoLMHYL8&mf?H< zrD`wF()i_nd#gE|l|ajnJugJXyD2K563(X71fSGY%S;y|W9Re3B(@eK?1j zyOLnS!c(mQotqv9cur#Q)?<;gntbxdO_5U~JZ#&`cE{!^Z94r_sL5}xhf3V%pMT2D z&i<6@b-VquhVSxAkzIG!-LX-+urhOf_tB&V-{O5$d*h1s#xYlJt&h5x;xysJjIEy* zU(MUTb;d{T_GDIu)A}rPrSzw4&oQe$zRW8A@y8vf4yNo`-nt-obaNo%jTcdidDw-d>cHH^vZ(X+0%q<1;qrcQn{dDgO=aP#x3|r=H WQz