From c0beea76331f4a4b1dc2b694fd9afa0c76d03d5d Mon Sep 17 00:00:00 2001 From: Mikhail <99481254+DCFApixels@users.noreply.github.com> Date: Fri, 3 May 2024 21:21:21 +0800 Subject: [PATCH] fix icons display --- src/{Debug/Systems.meta => Icons.meta} | 2 +- src/Icons/Icons.cs | 39 +++++++ src/Icons/Icons.cs.meta | 17 +++ src/Icons/d_P4_DeletedLocal.png | Bin 0 -> 1168 bytes src/Icons/d_P4_DeletedLocal.png.meta | 114 +++++++++++++++++++++ src/Icons/d_Unlinked.png | Bin 0 -> 728 bytes src/Icons/d_Unlinked.png.meta | 114 +++++++++++++++++++++ src/Icons/d__Help.png | Bin 0 -> 646 bytes src/Icons/d__Help.png.meta | 114 +++++++++++++++++++++ src/Icons/d_winbtn_win_close.png | Bin 0 -> 379 bytes src/Icons/d_winbtn_win_close.png.meta | 114 +++++++++++++++++++++ src/Icons/d_winbtn_win_max@2x.png | Bin 0 -> 227 bytes src/Icons/d_winbtn_win_max@2x.png.meta | 114 +++++++++++++++++++++ src/Icons/d_winbtn_win_restore@2x.png | Bin 0 -> 283 bytes src/Icons/d_winbtn_win_restore@2x.png.meta | 114 +++++++++++++++++++++ src/Internal/Editor/EcsGUI.cs | 45 +++++--- 16 files changed, 774 insertions(+), 13 deletions(-) rename src/{Debug/Systems.meta => Icons.meta} (77%) create mode 100644 src/Icons/Icons.cs create mode 100644 src/Icons/Icons.cs.meta create mode 100644 src/Icons/d_P4_DeletedLocal.png create mode 100644 src/Icons/d_P4_DeletedLocal.png.meta create mode 100644 src/Icons/d_Unlinked.png create mode 100644 src/Icons/d_Unlinked.png.meta create mode 100644 src/Icons/d__Help.png create mode 100644 src/Icons/d__Help.png.meta create mode 100644 src/Icons/d_winbtn_win_close.png create mode 100644 src/Icons/d_winbtn_win_close.png.meta create mode 100644 src/Icons/d_winbtn_win_max@2x.png create mode 100644 src/Icons/d_winbtn_win_max@2x.png.meta create mode 100644 src/Icons/d_winbtn_win_restore@2x.png create mode 100644 src/Icons/d_winbtn_win_restore@2x.png.meta diff --git a/src/Debug/Systems.meta b/src/Icons.meta similarity index 77% rename from src/Debug/Systems.meta rename to src/Icons.meta index 891b53b..5754940 100644 --- a/src/Debug/Systems.meta +++ b/src/Icons.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 91478d75aea56d14283e3a4fac691ae0 +guid: 5e5c92576cfa24a48a3232844b4fc783 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/src/Icons/Icons.cs b/src/Icons/Icons.cs new file mode 100644 index 0000000..00cf9dd --- /dev/null +++ b/src/Icons/Icons.cs @@ -0,0 +1,39 @@ +#if UNITY_EDITOR +using UnityEngine; + +namespace DCFApixels.DragonECS.Unity.Editors +{ + public class Icons : ScriptableObject + { + private static object _lock = new object(); + private static Icons _instance; + public static Icons Instance + { + get + { + lock (_lock) + { + if (_instance == null) + { + _instance = CreateInstance(); + } + return _instance; + } + } + } + + [SerializeField] + internal Texture _helpIcon; + [SerializeField] + internal Texture _closeIcon; + [SerializeField] + internal Texture _closeIconOn; + [SerializeField] + internal Texture _unlinkIcon; + [SerializeField] + internal Texture _auotsetIcon; + [SerializeField] + internal Texture _auotsetCascadeIcon; + } +} +#endif \ No newline at end of file diff --git a/src/Icons/Icons.cs.meta b/src/Icons/Icons.cs.meta new file mode 100644 index 0000000..f7d20bb --- /dev/null +++ b/src/Icons/Icons.cs.meta @@ -0,0 +1,17 @@ +fileFormatVersion: 2 +guid: 2ce72fefbf3696f4fb3861773bd997df +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: + - _helpIcon: {fileID: 2800000, guid: e135cf23a5d53ce48a75e163b41e39d5, type: 3} + - _closeIcon: {fileID: 2800000, guid: 8a708e50662813d4a99c107e6431a60b, type: 3} + - _closeIconOn: {fileID: 2800000, guid: 6a1d402595b00c24db2ba647fed93a5c, type: 3} + - _unlinkIcon: {fileID: 2800000, guid: 5baead89a941e034e9f44d63617d3246, type: 3} + - _auotsetIcon: {fileID: 2800000, guid: d01e651682f48b548b597714f47e14b9, type: 3} + - _auotsetCascadeIcon: {fileID: 2800000, guid: 8f9fb2a8877577940971d81a98aeaaaa, type: 3} + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/Icons/d_P4_DeletedLocal.png b/src/Icons/d_P4_DeletedLocal.png new file mode 100644 index 0000000000000000000000000000000000000000..1bcd2c11c4ca8d685e732021eb7f8c10267c6332 GIT binary patch literal 1168 zcmV;B1aJF^P)!K=ACL%M^kNXacrgbd zdPv+$AR?HU7n^-#{Jx&4-tOL+-3Zn)+g;Vw^;K6_zoM&gLxxdHvi7>Pjapj{O<9wk z*R3Nba(PQ48S`{K#ek_Qe~4~v8JD^opnD1!nn?lQ!q0ay1gDLf?1?&&*-X_mO25C; zAl1+~ov6T-9$YD-4mA2yW;}w5I?;mFLo+n(r+k$obV)~EbL63uegyVx_wopc0k4}V zXHGHBq%j)TPrB-|VJ!#f@k^#w#(;)|!_{O;j zIe&7TO$nT}jyt+uHM$ZX^8^9&1AId8*SDu-qF$BfpVnky^%vE)5DAV@a);uFQ)lJH z%}cV~?#YvPE3&d_qSM6EzD|AWh7?W3$3vO&^A$-KIGQ*2t{HG`aGl6y7F=~)CnD+1 zL;gnF+_E}`4WfiFmyw)5G46p=_a#P2LL{Igq9bQrX{X(l?M_$O(lSb7W1~nR#&Y2l z#19Z!1$7k}39f2}-KF*219|*@MOdbiE}_j#m8+xm=yF`sdQoYUtIUb86Gwjk?bjSU z!ji2Md@IybzH+AF?&~VH<%Y=NI~+@ozHRO|)_2=7cj2^c3@ZfZ$k+au?Y-HN^sY!3 zHaHc<-zW!&abzc+eO#5#KeyQjnV)jxO)|sC9>>F!+&0d68BNq}G%>Ng(&TdcA0+}d z4~nwgHOA@TG;z8(ZJa)|BZB2L%7G(;E5yG#5e>PL*=@LNAx4{STCV$b9s~61mG)3Uqw`MiQq2r3eK01O9UUJ21Km_ z@cuxJ0|Y0zPckFO|8O%h5l~qOPI(W%K_~o2Pk-cnxw)3}DW*9%qsr?A(!qV2+c)Cpv$IJ6hQ@=BDf9LLf}SS4Z6^U z8>L7}cM+r;K?0eQ z17~8lpi-%HVw(U1rBdlf%Xw*2{JSoMS`6q2B+Ez3 z@h^$GdD377Oz`{-=&To=58FU|E}uIwnnRdavzxQ1%1*5&{7mSrHJB3loLDRd{E*zO z&jNjG==#A0a2wP!G3k6T1>$r0+=O(Z)Joi{dyFGzOuC*tlnk6eu~^(}wOTohSq;^)tSUw}olf6scD^n&0R*&5rP480 zo%Njtp{PbKl}a5TnWkoMYf9=0g~Can;E&O0bSV~#O(YVDaqtTWbY)`Ehl!iAe!N-% zmK{JhrXvE~XEK>}Q|9wX_7WA__2;Ch#Fn-lVg=Z6+;bDmFG{A+9kvwR#y;U!~|T|Wz+RE99B~yMy*!c0$GF2GWcc6z`v22A2E1xOqt1#m=lw4 zG#XNwU93EUt!bNMOX?U7C!li(Xu`C4*fN3Z9t8wq1)$?O5Bt8b$J?mN3j#+m4h07h zOH07NWCYB1gYDy}-5{{d287{?U@T&32?$snG0Odp;1`_nsDkWtG`+vD?cEp8OiO^* ztM)w;n5&1;o@NM}Pf4#O&~7Zr5%NVeV->4^0iRIps1mWn1o*IMpjg!?^fMUKnjLi- zmY4uvHI%rjfIs01p5}nflVnE>Vo7>20Y0g4)*hfUG~p`;?9QbC#L%8+F#!Vd4oCU= zUB^^+&o;JWo`T>By%lr{&e`S4bNt}huLk`X9MuVZjzbghf&c6eiJt)JZ~P@Q g@rV4d0{^oD-&-d5+>~6p$p8QV07*qoM6N<$g05;M82|tP literal 0 HcmV?d00001 diff --git a/src/Icons/d__Help.png.meta b/src/Icons/d__Help.png.meta new file mode 100644 index 0000000..439d0b0 --- /dev/null +++ b/src/Icons/d__Help.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: e135cf23a5d53ce48a75e163b41e39d5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/Icons/d_winbtn_win_close.png b/src/Icons/d_winbtn_win_close.png new file mode 100644 index 0000000000000000000000000000000000000000..e34cdf9c42f41a405cb1c2a2436a77006abb117d GIT binary patch literal 379 zcmV->0fhdEP)50S=j*kHYEMoAZ1#k?1Rt0dNO?;1u zAaY=NtoE!5aJF}pKocR6+mdz2LGeH=NO3`V^IMBX#|*erSZ0} z1p*UlNdgcY65-}{ks~%)fFoLVI4=jrspYKP$IwG+FFAqOJ>-Z}PXPc&xBn@DWIb$$ zLwrx18;5HzFdk;mwXIkF{*bKnl-J@wap3z7 Zd;s`BE^(oknMnWu002ovPDHLkV1i*Or8ocp literal 0 HcmV?d00001 diff --git a/src/Icons/d_winbtn_win_close.png.meta b/src/Icons/d_winbtn_win_close.png.meta new file mode 100644 index 0000000..26a947b --- /dev/null +++ b/src/Icons/d_winbtn_win_close.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 8a708e50662813d4a99c107e6431a60b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/Icons/d_winbtn_win_max@2x.png b/src/Icons/d_winbtn_win_max@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..66dd3d6f35455cefcae0f5c7d40a967107f5929e GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJRh}-6ArYK!ryb;NRSzMTb!+X|Js}ncQ;y;Y+%edxQ;jKz}30$#j`UnGJRw6zonJ%=Hb_Sm+hCD zi+>bw%6s}!xTApsi1zq3++%%_QqceX+^1`n@ktl7zJ2uMT+o~4Ys0ni`=v=6cl=RO bV5(Q1q&H#it)AIHS2K9J`njxgN@xNAM|EG? literal 0 HcmV?d00001 diff --git a/src/Icons/d_winbtn_win_max@2x.png.meta b/src/Icons/d_winbtn_win_max@2x.png.meta new file mode 100644 index 0000000..7125548 --- /dev/null +++ b/src/Icons/d_winbtn_win_max@2x.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: d01e651682f48b548b597714f47e14b9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/Icons/d_winbtn_win_restore@2x.png b/src/Icons/d_winbtn_win_restore@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..dc22a341c8aef5c7ee156b6e94972c56b948e2c2 GIT binary patch literal 283 zcmV+$0p$LPP)N$H0r(D3SEKr^)wL`o ziOE;m5Qe{iTIxt3K7iXXySH!JY3 hoG6LwTopKn0$=a}Nr4Sy+6@2z002ovPDHLkV1l9JboKxM literal 0 HcmV?d00001 diff --git a/src/Icons/d_winbtn_win_restore@2x.png.meta b/src/Icons/d_winbtn_win_restore@2x.png.meta new file mode 100644 index 0000000..343fb69 --- /dev/null +++ b/src/Icons/d_winbtn_win_restore@2x.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 8f9fb2a8877577940971d81a98aeaaaa +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/Internal/Editor/EcsGUI.cs b/src/Internal/Editor/EcsGUI.cs index 82e7894..85c2b9d 100644 --- a/src/Internal/Editor/EcsGUI.cs +++ b/src/Internal/Editor/EcsGUI.cs @@ -130,6 +130,12 @@ namespace DCFApixels.DragonECS.Unity.Editors // // return result; //} + public static void DrawIcon(Rect position, Texture icon, float iconPadding, string description) + { + GUI.Label(position, UnityEditorUtility.GetLabel(string.Empty, description)); + //GUI.DrawTexture(RectUtility.AddPadding(position, iconPadding), UnityEditorUtility.GetLabel(icon, description)); + GUI.DrawTexture(RectUtility.AddPadding(position, iconPadding), icon); + } public static (bool, bool) IconButtonGeneric(Rect position) { Color dc = GUI.color; @@ -172,15 +178,19 @@ namespace DCFApixels.DragonECS.Unity.Editors //return click; bool result = GUI.Button(position, UnityEditorUtility.GetLabel(string.Empty)); - GUI.Label(RectUtility.AddPadding(position, iconPadding), UnityEditorUtility.GetLabel(icon, description)); + DrawIcon(position, icon, iconPadding, description); return result; } public static void DescriptionIcon(Rect position, string description) { using (new ColorScope(new Color(1f, 1f, 1f, 0.8f))) { - GUIContent descriptionLabel = UnityEditorUtility.GetLabel(EditorGUIUtility.IconContent("d__Help").image, description); - GUI.Label(position, descriptionLabel, EditorStyles.boldLabel); + //GUIContent descriptionLabel = UnityEditorUtility.GetLabel(EditorGUIUtility.IconContent("d__Help").image, description); + //GUI.Label(position, descriptionLabel, EditorStyles.boldLabel); + + DrawIcon(position, Icons.Instance._helpIcon, 0, description); + //GUIContent descriptionLabel = UnityEditorUtility.GetLabel(Icons.Instance._helpIcon, description); + //GUI.Label(position, descriptionLabel, EditorStyles.boldLabel); } } public static bool CloseButton(Rect position) @@ -190,33 +200,44 @@ namespace DCFApixels.DragonECS.Unity.Editors var (hover, click) = IconButtonGeneric(position); if (hover) { - Rect rect = RectUtility.AddPadding(position, -4f); - GUI.DrawTexture(rect, EditorGUIUtility.IconContent("P4_DeletedLocal@2x").image); + //Rect rect = RectUtility.AddPadding(position, -4f); + //GUI.DrawTexture(rect, EditorGUIUtility.IconContent("P4_DeletedLocal@2x").image); + + DrawIcon(position, Icons.Instance._closeIconOn, -4f, null); + //GUI.Label(rect, Icons.Instance._closeIconOn); } else { - GUI.DrawTexture(position, EditorGUIUtility.IconContent("d_winbtn_win_close").image); + //GUI.DrawTexture(position, EditorGUIUtility.IconContent("d_winbtn_win_close").image); + + DrawIcon(position, Icons.Instance._closeIcon, 0, null); + //GUI.Label(position, Icons.Instance._closeIcon); } return click; } } public static bool AutosetCascadeButton(Rect position) { - return IconButton(position, EditorGUIUtility.IconContent("d_winbtn_win_restore@2x").image, 0f, "Autoset Cascade"); + //return IconButton(position, EditorGUIUtility.IconContent("d_winbtn_win_restore@2x").image, 0f, "Autoset Cascade"); + return IconButton(position, Icons.Instance._auotsetCascadeIcon, 0f, "Autoset Cascade"); } public static bool AutosetButton(Rect position) { - return IconButton(position, EditorGUIUtility.IconContent("d_winbtn_win_max@2x").image, 1f, "Autoset"); + //return IconButton(position, EditorGUIUtility.IconContent("d_winbtn_win_max@2x").image, 1f, "Autoset"); + return IconButton(position, Icons.Instance._auotsetIcon, 1f, "Autoset"); } public static bool UnlinkButton(Rect position) { - bool result = GUI.Button(position, UnityEditorUtility.GetLabel(string.Empty)); - GUI.Label(RectUtility.Move(position, 0, -1f), UnityEditorUtility.GetLabel(EditorGUIUtility.IconContent("d_Unlinked").image, "Unlink Entity")); - return result; + //bool result = GUI.Button(position, UnityEditorUtility.GetLabel(string.Empty)); + //GUI.Label(RectUtility.Move(position, 0, -1f), UnityEditorUtility.GetLabel(EditorGUIUtility.IconContent("d_Unlinked").image, "Unlink Entity")); + //GUI.Label(RectUtility.Move(position, 0, -1f), SettingsPrefs.instance._unlinkIcon); + //return result; + return IconButton(position, Icons.Instance._unlinkIcon, 1f, "Unlink Entity"); } public static bool DelEntityButton(Rect position) { - return IconButton(position, EditorGUIUtility.IconContent("d_winbtn_win_close").image, 0f, "Delete Entity"); + //return IconButton(position, EditorGUIUtility.IconContent("d_winbtn_win_close").image, 0f, "Delete Entity"); + return IconButton(position, Icons.Instance._closeIcon, 0f, "Delete Entity"); } public static void EntityBar(Rect position, EntityStatus status, int id, short gen, short world) {