From 99c9e05f1cbb252ebb29843ee95d47b06b5927aa Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Fri, 25 Nov 2022 19:52:54 +0700 Subject: [PATCH] Add missing icons + tweaks Fixes/changes - Compile error in input_bridge_v3.m - Removed calls to end editing of text fields in CustomControlsViewController.m - Simplified FlatLAF patch error --- .../java/net/kdt/pojavlaunch/uikit/UIKit.java | 3 ++- .../MenuCustomControls.imageset/Contents.json | 12 ++++++++++++ .../MenuCustomControls.imageset/icon.png | Bin 0 -> 2106 bytes .../MenuInstallJar.imageset/Contents.json | 12 ++++++++++++ .../MenuInstallJar.imageset/icon.png | Bin 0 -> 2593 bytes .../MenuNews.imageset/ic_menu_news.png | Bin 280 -> 1070 bytes .../MenuSettings.imageset/ic_menu_settings.png | Bin 293 -> 1105 bytes Natives/CustomControlsViewController.m | 2 -- Natives/LauncherMenuViewController.m | 16 ++++++++++++---- Natives/input_bridge_v3.m | 2 +- 10 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 Natives/Assets.xcassets/MenuCustomControls.imageset/Contents.json create mode 100644 Natives/Assets.xcassets/MenuCustomControls.imageset/icon.png create mode 100644 Natives/Assets.xcassets/MenuInstallJar.imageset/Contents.json create mode 100644 Natives/Assets.xcassets/MenuInstallJar.imageset/icon.png diff --git a/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java b/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java index e0426508..25873c51 100644 --- a/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java +++ b/JavaApp/src/main/java/net/kdt/pojavlaunch/uikit/UIKit.java @@ -23,7 +23,8 @@ public class UIKit { // trigger static init clazz.getField("isMacOS").get(null); } catch (Throwable e) { - e.printStackTrace(); + System.out.println("Skipped patch_FlatLAF_setLinux"); + //e.printStackTrace(); } System.setProperty("os.name", osName); } diff --git a/Natives/Assets.xcassets/MenuCustomControls.imageset/Contents.json b/Natives/Assets.xcassets/MenuCustomControls.imageset/Contents.json new file mode 100644 index 00000000..1ffad00d --- /dev/null +++ b/Natives/Assets.xcassets/MenuCustomControls.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "icon.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Natives/Assets.xcassets/MenuCustomControls.imageset/icon.png b/Natives/Assets.xcassets/MenuCustomControls.imageset/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..14ec878534b5c57cdce82245b0e0cd4472ac16aa GIT binary patch literal 2106 zcmV-A2*vk_P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00004XF*Lt006O$eEU(800001 zb5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m_e01m_fl`9S#000M( zNkl-Xv6D?pH4AO`e6$N2Yfdv;>)?Mg1P?|NnE&oOAy3pML-pC{Un4fdT~z6#PG-O16Xf`T0~lR3MpkwCX61=&&dC7!lJ~fU_JPRL9=PrMLM z9DI(vtK_f%n&$FD7jtuS(9zMc>>?oXM7*(3jI=`z1-!$)aJgJCH8r(3Qq9jpNoOb2 zT(|%^_wUDim3SiFIB1YV0d?$)!NI|}4Ms*r7~kya=}Ag{+vUr!{rq`Yi(l7%<_wtl z0zw?#>XK3b`cNi!&L0{YipzLgTN^V&T)%#uQAVQ3y?5_b!s7Qs&VvUr-xuI*doWc` z*aB*iw4n>1&j-(*J&T{8dcEQEv9Ym)6)*PY3hB06eU!0*~1o^L^rNcz76!i;KB3w92A@SmsZeAj@?UGx=3_ zz>qo#LysyT;MXzt9&OpeP(;8>8wXc@FIb)ygUOxGa{~bdNY4a={y)lA(#4Axc`iUc z-qO+%b!IRa44~KR!`EeHWl&L3!F#W~@@FV{?J9Hb9xZ}vEuX;r9Dk|eHa~_d^(Vov z@qv0y3w2jMg6yYj!p|)h3+&sskKJUJlE!GuX0=%VpPikB(a}-fOWobwF{edpN7fM{ z%Gv^f0Pj8P+E=-S$ua;&)39KF53OB{@Qlf;{m{SWuZZWwBRdAgivwyY<}YO0D_5?R zX6CuMpwaNZ?D(iPeE!0h3R517V0#PeJ%V|xP|R#lmq-i{<^P*DZG!y#{BZQ8J>b3z&_GS@@92pFMjveBIR41O){J3C{%6a|Uqvj8J441)VA&s*TBH zg8lpVi;4qUG5$X@GqWVCzWd%B`2NY8;GNTfS?htrtC}HQGaI*^+wErJQd(LXHx9Il zjRB&kKb}Ul+6W(4tJMiB;5WC85uQn?{ONFO+A6xO*f=1&0!a9pni^*6Bh#m#mvF&D z8#%kAsC}|4KoiCPzh*0^y}h0BZL!G9%VUDyh7B8%vVdar`=J+E;0YL@I-?)##$F6s z;*u=lmjX0u$w+(1!)9P9u8kOFx10c|Y*Cm$kTN)$9DQth7nkg`B2pp24g3B*IfN!0W- zlfQ&AQK2}XT?q3h!7D2(nU!BkN^;wVqySoQ-M)Q0p=CD7z)}FOKA@Ic0kmtgXU`r+ z0m%waAnU2Et%b(MMrLU(cN|c&{GaBn&B-djZnr~rcDC&PTv%8LyLRo8JiQ96VrznX z9XuDX1brmzKT`MlDDe?k_|T3;C%LsmnQ0HQnq+4yVdKV)lB&(2dIT#UAhTRc6*sN| za-tPB#U?&v_8feN^f5jQB=XgRU+NUn2cdg3MsIH~`2BuKO5k99NCE5^FvKloNdc|D zIlHw~4nCTw@Ij?g+oQq07^J4ALV0<)q<#csndHR)9E|eaC!uRvO47PoECjy(Y3wuU zEu>%{r`h*tok25=7|=F4%lt#=k2VWjW?xiQRf!s;w6qk=ktJ*L_Y*S4z!U5kLRKK4 za6xR{x|MtD7AkchngUL-FV?MFCs@H{gChQp9lSlrb2x}>DP*v(b6hJZDk_TEj(DfQ z%)yUQQ(+wFcRXB+m@{x~-_X#&O(qxO;961;LAM`#_nZPTwVgD1-S2%!cF_*f?8|}z^ zhV&kly98b#H~xVFJMtDa3zhPl+$x&!f*IpeN}RCcyUStSkGy3E(_7+=*6(+aw_#AA kK!E}U3KS?%pdc##1#004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00004XF*Lt006O$eEU(800001 zb5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m_e01m_fl`9S#000Si zNklT*jSmEz3Rb|e0yCmWAUsSVy2%1PX26(_0=LLYH>LnUA#kAJ`C>5qmPzYB zj^;-uNJj!s0%w_^{T^_cAq8NeJb^`?LV6KnT zKNk#F<7}NU!1D*dUJAuDG?2fjh=MzI5H&WEb?8uXEm}mj(W5mPhL0Q}|H_pV`UF1D zVj(+dT+5b`<;ELhhr0MU*mYWpuapHE!zXy>FUE!n1g<;_l$TTJ@L}>CI6xMUCzj*^y+>eqjN?;-iBQ%!0}AM` zu;9_79fa>7;M%q1&Ce&v>+RSP3XyOAeDXj2bO+(D@T{(;AQT~*->SpGHn_KKlng93rhI*@p^*P$RU-8^~ zjsjnv>qJ_P=vPjQKQIu%Prc@uBwWfM~{{7m*r=^i2FHbnXHIDEO zG%G}X{u3oQ0bUB#9-!cbZK5GJ0iV>NfPG3=YA4srFXMtX8ltF!v$T{fnVG`*ZGk-zeeGfv!bpCpwtN(N;t>k zfVFB{ISqk~B|Tlk><)6TTSv~ts);2F{e8@LJlaCh*1v}f4zc$>TiADSHg})4N_>VjAjTy8`6!f%yQKojrJNk(8?^EdVAyL;5IS(g|op3~sJI;vut%C+p zw>^8vHf&hO=Y9KihgL3OAn8pW`D+v}JsUtm(IlY6bxaxL1n@#xy|*Z{p8y0|$$OCHs^q zWE(JmT*&_7_=a7aaYFd>Y6Bt)z+_K|5}wededIq`YWNBYe{+PK{pY}3HqkEF00A3y zD1nt#j`2-ug-+`occ`Vtl6<|+ZTI%7$4;)wd?~VisCGX*|5;N(h`o0E?Q2KhExeoN00NwHvsdBQ~>(!5jr>3P@0o>;&Kf>>Jefg^8qF z0a(<%a+z$D&N!cwmZe;AH7GoX$A3tI(I3UyHbe(PY763^XgzSY!8ku3mPhd z^%8CTOTe^n)9$-UZYoHEVBK=^{;UDWHE!HKOhjQ1X~mRzR-EvW32% zlRxswtv+Dk7yFj~udg~|3V>z!U7*4`TLK@_S7GB-;jO_+HM)tZx&!zPj9YZ}O@*}h zR~g(V>gtzjS7Q5OgrB)qNoPzmR@niLs}$!atN`I9-Ym74X52`sPScZ$3b-Wdyw1|g zG~+n5HL0k8e~CJW+J=~Be7BgkUT0pATm{HKCsDjn$+J&FzHI#aoF0~R8gCmZ>iR5| zwB z6~#xloaOECY@!_d=(vpds1!K!X+zqJYR6^`=D3j3=`gkZZf9(4P{iB$-L!SIC%B(B z1vb;((5F-@)kXSlw%$NlwtJ}1kxzHo2B}8Kr1C*zN-2Qf*&$Nnj~Ct`LA@~BeqRI) z0(8N}>LmVL&3G6*52k8GNEnx6!TgOcd$QI9cyoDt zJb0DsP9c&5lBNP=CGhX@xDZaeu3+H>>IM< z#Pa-c(spWl|Np6ph4C*__*V^?S5f#nd7dul0vY}TrIIR}m_35B00000NkvXXu0mjf DW_!|< literal 0 HcmV?d00001 diff --git a/Natives/Assets.xcassets/MenuNews.imageset/ic_menu_news.png b/Natives/Assets.xcassets/MenuNews.imageset/ic_menu_news.png index 5fdcc075437ed9c671cb67e8bbf3f7ea0630258a..e6ceb02f5ab1927a89c63c3db7d06e088690c2c7 100644 GIT binary patch literal 1070 zcmV+}1kwA6P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00004XF*Lt006O$eEU(800001 zb5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m_e01m_fl`9S#000Ap zNkl}Mn-3}~Dn46*R#sLH=(^s7;U|yBb5D|_?`F76CL_mUvD0`x2>f_u zW#yDr%%!EJfWzUqz-s_@2>Czc$bX3ENBpSQ>%EWox{JaIY-O&oxb(v5J}H zEur9dIPO8vR*;+62*m4`aJU6mjHwwE-mI!>OvEiNF78qkWemdxV@gNN>xg;7BxXGh z58!TNii>{|cQA0l&vkWmP4@Nmy%&I&aTpYmbK8wKHvu~W>^Fh@V+`xX?t&ld=;(0t z_xFzr${&F+j|B4EobWTiz5w>4faT)#8nLpr4`;Wry}f;8U|=9+)TyCEo(bfcQS%AZ z8AqK{0;fjQ{}4kB?&BSh5#E$UaV6kNlHHcO1yMGLl03-kjKmw2eBmfCuUo+bYveng9mP)0HifBnm2`eov%};>& z`FXamuuxP2R8>{6U@%BafCL}`NB|Om1Rw#n*az?pgQ}`UMbvB)WGO%(5cuh|1V{i9 zfCRARr$96sE$H1~ZEY>{`~92lKxb!X3zoB{riO(=A?g4UfCL}`NB|Om1lVF9@IS1) zyxjC#+rMRQw|i#`zzei0l9m7oKmrv1MKGC6@}I;OEWXR-Vw$GyTmd-wLf;LV2|(8X z5`Y9C0Z0H6z~&pFHTLTt8^4V|7W4Uh1xs31R<>!5=L?6!1!lvI6;>1s;*b3=Cq*Ak26&Fd-W#xYpCfF(kr0St8>A$5O)scV-IzZ+@}k1cSl+ zum(;qehCFDmUXc^`ImiU)RlGB;ND-AQpzmHbl9A$gB3_PD7JAcH(xX{C~;~COZc&j zvE~(fXrRw#6N40|ga?ZsJle?oV1ZrnPo)S3S)Tt*9XA9NM0w`scxbTrlzd&NbEjd> zj`qfjIUM~=5)H1bmYw|pVXdyBn|3wwGisb|kQ3U%@+*w5pqkx=#my=qfq}s#JIAee TJ@-AJ!x=nX{an^LB{Ts5ENxk9 diff --git a/Natives/Assets.xcassets/MenuSettings.imageset/ic_menu_settings.png b/Natives/Assets.xcassets/MenuSettings.imageset/ic_menu_settings.png index cda0fed91d7c64e09045076e77def48b9ee8db2e..a74ea6ad8ae6901811f0aa21a4624c0931af8c04 100644 GIT binary patch literal 1105 zcmV-X1g`suP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00004XF*Lt006O$eEU(800001 zb5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01m_e01m_fl`9S#000B1 zNklnmxcnm=a z$J^W6#}bLeJ0tht?5qGqQ6lK-<_`->IBWDCwpM_{;qVr{@=~P$D~Ngp@LCh%@%RCB zU1&>9G<5~{`))88ysj~I9rzh9bJUMNTjr4*x>eZ5OW%r*@ga zAT0{O9af89(H01eXpGGdgsK{)@q7$8z7vM98^cLBz|*XPVfTVaG#Xv*@px|H)LPNv zfT1p`oS@t7z5u}w;;|Vfd!?_hZ$E7)u(2p`*+!cJoJ9)YX;Z-Bss|84KClc)#mX{+ z7f(6!km@#?nQ4OGY2+4D6)OOY-hxmk(F{S1-rn9-!1w1^ui4C#RTPC3b9#co;8ERI z04Lu9Mo$?DmoAs<1VIRkEc^(Of%yQv3P39S0bP%g8_vzm-9h)>id+f^bUQCYWs#sH zNp*4F-$z03THffXO>bjaeXMHyDgYqn_H@T0bDIX+fEY zs{TaYKcMx&6Z2X`QS3B46H?VQVh~X)A1G;lgM)*7I-Pz&O58g6_@OAumPjNrUQl4^ z#(KvrI^d!D`ugo{ZEcFKD=;xJv8e*#39UfJ7pS6zZ%w6An|1pDS(ZPeo2ihAuT@ll z;&Qptx_tmlcM>Lh2v$J8$-8wh@Mv^&G^R0!{2Vc5g7Cl5E^7H8O(&TD%c|c*SWIFM zKZ8N007?`9e=<{QOoIj7Lz@pyWbz4}s&qIX43R%j$?tbB1wr`4suGMCF=E7sQB~+K X7uH=y^_m0m00000NkvXXu0mjf+A!Q( literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=Cq*Ak26&Fd-W#xXaVUF(kr0S>j`ZpjWeFY1Er~fwvFeF+FQ; z$Sttxk`icG$;{}K<;XC9r%%E?h9<^x2G78PinmT1_Oz~Mp3%>};nPXs+;X)v6&I-#m)lreX!gz9fW=C(SK1}{DGf%XM8+XRe@N^1Bawj1mXJiVk_5oj8?a