Skip to content

Commit

Permalink
Merge pull request #165 from aiekick/DemoApp_Places
Browse files Browse the repository at this point in the history 
Demo app places
  • Loading branch information
@aiekick
aiekick authored Feb 20, 2024
2 parents 187966b + b9798b5 commit d7bcd39
Show file tree
Hide file tree
Showing 17 changed files with 308 additions and 117 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/boost
Submodule boost updated 74 files
+42 −10 .github/workflows/ci.yml
+10 −0 .gitmodules
+1 −1 CMakeLists.txt
+1 −1 Jamroot
+1 −1 libs/any
+1 −1 libs/asio
+1 −1 libs/assert
+1 −1 libs/atomic
+1 −1 libs/beast
+1 −1 libs/bind
+1 −0 libs/charconv
+1 −1 libs/chrono
+1 −1 libs/cobalt
+1 −1 libs/config
+1 −1 libs/container
+1 −1 libs/container_hash
+1 −1 libs/conversion
+1 −1 libs/core
+1 −1 libs/describe
+1 −1 libs/detail
+1 −1 libs/dll
+1 −1 libs/exception
+1 −1 libs/filesystem
+1 −1 libs/function
+1 −1 libs/geometry
+1 −1 libs/integer
+1 −1 libs/interprocess
+1 −1 libs/intrusive
+1 −1 libs/iterator
+1 −1 libs/json
+1 −1 libs/lambda2
+1 −1 libs/leaf
+1 −1 libs/lexical_cast
+1 −1 libs/local_function
+1 −1 libs/locale
+1 −1 libs/log
+2 −0 libs/maintainers.txt
+1 −1 libs/move
+1 −1 libs/mp11
+1 −1 libs/msm
+1 −1 libs/mysql
+1 −1 libs/numeric/odeint
+1 −1 libs/outcome
+1 −1 libs/parameter
+1 −1 libs/pfr
+1 −1 libs/preprocessor
+1 −1 libs/program_options
+1 −1 libs/property_tree
+1 −1 libs/qvm
+1 −1 libs/range
+1 −1 libs/redis
+1 −0 libs/scope
+1 −1 libs/signals2
+1 −1 libs/smart_ptr
+1 −1 libs/stacktrace
+1 −1 libs/stl_interfaces
+1 −1 libs/system
+1 −1 libs/throw_exception
+1 −1 libs/timer
+1 −1 libs/type_index
+1 −1 libs/type_traits
+1 −1 libs/unordered
+1 −1 libs/url
+1 −1 libs/utility
+1 −1 libs/variant
+1 −1 libs/variant2
+1 −1 more
+1 −1 tools/auto_index
+1 −1 tools/boost_install
+1 −1 tools/boostbook
+1 −1 tools/build
+1 −1 tools/cmake
+1 −1 tools/inspect
+1 −1 tools/quickbook
2 changes: 1 addition & 1 deletion 3rdparty/glfw
Submodule glfw updated 94 files
+5 −5 .appveyor.yml
+67 −0 .editorconfig
+0 −2 .github/CODEOWNERS
+60 −54 .github/workflows/build.yml
+1 −0 .gitignore
+1 −1 CMake/glfw3.pc.in
+7 −13 CMakeLists.txt
+28 −0 CONTRIBUTORS.md
+69 −34 README.md
+0 −247 deps/vs2008/stdint.h
+102 −0 deps/wayland/fractional-scale-v1.xml
+83 −0 deps/wayland/idle-inhibit-unstable-v1.xml
+339 −0 deps/wayland/pointer-constraints-unstable-v1.xml
+136 −0 deps/wayland/relative-pointer-unstable-v1.xml
+180 −0 deps/wayland/viewporter.xml
+3,151 −0 deps/wayland/wayland.xml
+200 −0 deps/wayland/xdg-activation-v1.xml
+156 −0 deps/wayland/xdg-decoration-unstable-v1.xml
+1,370 −0 deps/wayland/xdg-shell.xml
+37 −26 docs/CMakeLists.txt
+8 −9 docs/CONTRIBUTING.md
+113 −67 docs/Doxyfile.in
+1 −1 docs/DoxygenLayout.xml
+1 −2 docs/SUPPORT.md
+159 −78 docs/build.md
+85 −77 docs/compat.md
+90 −113 docs/compile.md
+45 −47 docs/context.md
+167 −163 docs/input.md
+9 −12 docs/internal.md
+93 −85 docs/intro.md
+1 −6 docs/main.md
+44 −55 docs/monitor.md
+149 −141 docs/moving.md
+98 −56 docs/news.md
+58 −60 docs/quick.md
+34 −37 docs/vulkan.md
+253 −212 docs/window.md
+0 −1 examples/sharing.c
+215 −100 include/GLFW/glfw3.h
+63 −34 include/GLFW/glfw3native.h
+31 −63 src/CMakeLists.txt
+72 −74 src/cocoa_init.m
+8 −5 src/cocoa_joystick.m
+7 −2 src/cocoa_monitor.m
+1 −1 src/cocoa_platform.h
+0 −2 src/cocoa_time.c
+32 −13 src/cocoa_window.m
+2 −2 src/context.c
+12 −10 src/egl_context.c
+1 −2 src/glx_context.c
+11 −34 src/init.c
+13 −8 src/input.c
+24 −27 src/internal.h
+6 −5 src/linux_joystick.c
+1 −0 src/linux_joystick.h
+1 −3 src/monitor.c
+13 −9 src/nsgl_context.m
+72 −74 src/null_init.c
+0 −2 src/null_joystick.c
+1 −3 src/null_monitor.c
+0 −2 src/null_platform.h
+2 −3 src/null_window.c
+2 −5 src/osmesa_context.c
+22 −5 src/platform.c
+9 −0 src/platform.h
+0 −2 src/posix_module.c
+0 −2 src/posix_poll.c
+0 −2 src/posix_poll.h
+0 −2 src/posix_thread.c
+0 −2 src/posix_time.c
+0 −2 src/vulkan.c
+18 −2 src/wgl_context.c
+75 −75 src/win32_init.c
+7 −2 src/win32_joystick.c
+0 −2 src/win32_module.c
+14 −2 src/win32_monitor.c
+3 −0 src/win32_platform.h
+0 −2 src/win32_thread.c
+5 −0 src/win32_thread.h
+0 −2 src/win32_time.c
+5 −0 src/win32_time.h
+109 −20 src/win32_window.c
+26 −9 src/window.c
+177 −96 src/wl_init.c
+15 −20 src/wl_monitor.c
+30 −25 src/wl_platform.h
+534 −402 src/wl_window.c
+77 −79 src/x11_init.c
+14 −2 src/x11_monitor.c
+17 −15 src/x11_window.c
+0 −2 src/xkb_unicode.c
+23 −13 tests/events.c
+36 −7 tests/window.c
2 changes: 1 addition & 1 deletion 3rdparty/imgui
Submodule imgui updated 55 files
+1 −0 .github/ISSUE_TEMPLATE/config.yml
+90 −0 .github/ISSUE_TEMPLATE/issue_template.yml
+0 −46 .github/issue_template.md
+7 −7 .github/workflows/build.yml
+1 −1 .github/workflows/static-analysis.yml
+1 −1 LICENSE.txt
+1 −1 backends/imgui_impl_allegro5.cpp
+12 −10 backends/imgui_impl_android.cpp
+1 −1 backends/imgui_impl_android.h
+25 −3 backends/imgui_impl_dx9.cpp
+45 −7 backends/imgui_impl_glfw.cpp
+5 −0 backends/imgui_impl_glfw.h
+1 −1 backends/imgui_impl_opengl2.cpp
+28 −19 backends/imgui_impl_opengl3.cpp
+6 −0 backends/imgui_impl_opengl3_loader.h
+0 −1 backends/imgui_impl_osx.mm
+131 −52 backends/imgui_impl_sdl2.cpp
+5 −3 backends/imgui_impl_sdl2.h
+133 −54 backends/imgui_impl_sdl3.cpp
+6 −0 backends/imgui_impl_sdl3.h
+4 −5 backends/imgui_impl_sdlrenderer3.cpp
+136 −122 backends/imgui_impl_vulkan.cpp
+28 −9 backends/imgui_impl_vulkan.h
+46 −21 backends/imgui_impl_wgpu.cpp
+18 −1 backends/imgui_impl_wgpu.h
+208 −5 docs/CHANGELOG.txt
+1 −1 docs/CONTRIBUTING.md
+1 −1 docs/FAQ.md
+2 −2 docs/FONTS.md
+6 −4 docs/README.md
+0 −0 examples/example_emscripten_wgpu/Makefile.emscripten
+1 −1 examples/example_emscripten_wgpu/README.md
+163 −136 examples/example_emscripten_wgpu/main.cpp
+2 −2 examples/example_glfw_metal/Makefile
+1 −1 examples/example_glfw_opengl3/Makefile.emscripten
+3 −0 examples/example_glfw_opengl3/main.cpp
+12 −11 examples/example_glfw_vulkan/main.cpp
+6 −0 examples/example_sdl2_directx11/main.cpp
+6 −0 examples/example_sdl2_opengl2/main.cpp
+6 −0 examples/example_sdl2_opengl3/main.cpp
+5 −0 examples/example_sdl2_sdlrenderer2/main.cpp
+17 −11 examples/example_sdl2_vulkan/main.cpp
+1 −1 examples/example_sdl3_opengl3/main.cpp
+3 −3 examples/example_sdl3_sdlrenderer3/main.cpp
+7 −7 examples/example_win32_opengl3/main.cpp
+3 −1 imconfig.h
+802 −363 imgui.cpp
+244 −218 imgui.h
+160 −62 imgui_demo.cpp
+8 −8 imgui_draw.cpp
+249 −150 imgui_internal.h
+66 −28 imgui_tables.cpp
+136 −102 imgui_widgets.cpp
+1 −1 misc/freetype/imgui_freetype.cpp
+1 −2 misc/freetype/imgui_freetype.h
74 changes: 44 additions & 30 deletions CustomFont.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,47 @@
#include "CustomFont.h"

static const char IGFD_compressed_data_base85[3950+1] =
"7])#######Dl_0_'/###O@?>#+lQS%Ql#v#X^@iFm,6TH$&(##/i(##[[S=B7Rm.L:^Ee-]br-$KQshF=I&##'h$##<L]w',>p0FSQM:L3/Uw02)[w'o;<RDQjUw#IPH_&8Jq-$Mu@['"
"@c9*NbUD_&UKo-$fZIkESHP_?Xq&##a+(##n9?0Fb$'3^>Z%F7Acg--&OMkOQ&###U::d?odPirc[4gL_=$##+Yk>3;IGF%:=1?%+$-tL]em##PPL@-#VGs-Vi[+M4:T/Lr.TV-vtXR*"
"?=th#@fNX($W3&+5OOX(uue+MQxSfLaH<mL(x$m/mEexFTP'##>Uu)NuDOd$nGZ(%/@$Z$3.5F%>Lqk+GN=_/)@v;%V8C5M$@,gL1F5gL$@,gLKoG8.'5>##<F`p&C./YcZwKv-$;d'&"
"?dd.qjm$0qT4Q3qA^:7q'>b9qObm;qn&nCq,R[SqOim4vn/-F.PjoF.m7VQIB5KG.?(5k#iYkr-EX:p/'cYS.$-_'#RAB;-d+$L-Swxe%P]UV$0u68%47no%8ONP&<h/2'@*gi'DBGJ("
"HZ(,)Ls_c).fP7ERrD_&Q7)##pU(##Djo-$:H+##F&'##S:m-$O=)##@Sl-$7J(##)ak-$WQo-$&U79&G(35&?).m/:3NP&r:jl&<?u`3eE/2'hNJM'jLJM'na+/(9/5##9:m`-kj/I$"
"n&&)#Xn@X-jbtM(pSLnuw);GV_u.Dt?ba@tEfJ&#QTV'#T%J/LZ:;8%rtJfLXu5;-Su4;-bkh8.E7TfL7.SY.n,Ih(Lv_>$u7XI)E$X=$FR]tuVbxX#KF-,$6+hF4Ns5c]5]4xt(l0o`"
"HG]Y,V=SqFs-*#/>BxY-2>6=1SS@n3BQQY>tQZ50K;6xtBE3muOYE6j1#'58SM?o'r)#,2]V5D<G.H]F2[ZuP%2G>#kTSf-S9w0#k5e4vgYq3vH+6AM3(.m//tTB#6k9'#l1^gLT,pY-"
"->pH7TGl0-lfn0-m:-nkQjR)vt=X4'FK5.8hjkA#.2T>-T5T>-.Z)/V6*;Ga,n8f0)5###u/f##@P+58FT`>nhvYK7x(f+MfN#Vd:E`48:P$$$bl9'#])UK*O*oMMqAh1TdFi(EPpkr7"
"Hp`Js$T-##[YEt$bcx5#->Ha2F(@8%&Y@C#i_Z=7No^I*7nJ,2&f^DNGM1eN47DcNF<w%,(o'B#`//;MJ)Nfq57x:.3.v(EL.o&,pRpq#:a^)4=_)AF)bBg(2o58.[[5K)[(Ls-/t/I$"
"OEU*@hPt>P(&cI)9r_V$6^`A.,k`Cjj&nA#Y7,HM+@75/8e9:)K4j'MdZwe-fcBN,g6'@9<5jD3YdUV$sRk&#l,>>#@D5##]o;T/,oK9/)$fF4k&B.*-7T^,k(TF4^.RM0Rq@.*bZ'u$"
"cJF/M;`6<.*M4gL;ngo0TAOZ6W.PV-RVx_4QmuX$KOj`ub>(6RTcZULbR39/oBfU+-p9x9SP>bnQ5&X%pbO-)&-g[us_.u-=^7>N8$EG'i_7MTv+qM#ReBtLg@RxktpqbrUv?rC*+8C8"
"i&X1)e61nLx-$O*%@h-Ml=DX-xv@=(`()?#B8WeFW-u?-vOlo.$&>uuu]iQjhx###6T&],vQnW_$Dh8.w-<?#PE3j1j.dx3stb@$RieX-PbU/)9,d]u*l0[.p2rE3*cA/L>%jx-q-U&5"
"YZbA#Dc$a-1F-Z$3(m<-2&&b-cjHwB)j9e$*fF.#=F.%#bWt&#M3>V/2T/i)HrUv-F^?d))2pb4N*sKG'L/@#H`G>#x]5.3Z_[@#1N.Q@2eV5*k+)ul=^hA4+;wA4-l2%bt_NPoN%g1B"
"Yb]+42bMjLXF8:La,3.M58+**]kp)4JP`,u2U`k#Z-qDX;BgF/['9'#/W%RNV]UV$l(+&#g9e5/l)qH*c4oL(u3YD#=@)ns>4vr-Fdsw$/_?C+ohAYcqT@E+iW0KMes=p%%<TB+eq]o&"
"x$1v%Y_L=M/ifbMat0AXt&q`MYid##kJ,/19mb;-1u$+5&b+X$xIkI)ig'u$ikkj1./.&4maJX-Wh3a%BNg@#<:%[u;C]:/F^BBTXTi>.MvUk'R3Tm&?`I34s'o7l=E^[#JN$q3JDDW-"
"ex,##/snC>+[Ch4DZVs%am^q%hh)?#51&>Nd:1##aJ^'/YdYEnVKpdm$7[0#G,>>#b1=Z-)7(dMjCCv-gc``36SqcNKQL,3L1O058b4-5mS4'5841'5%J/GV/1:B#'at%$q^DIM=X0DM"
"3)^fL6)0/Ldbb(NRdimM-a4o7qPa>$cMDX:W<=&5R^i'#C.0u$CGF&#]rgo.NV9h&h0`.3f`aI)wuj=)V_TLpB9o*%j70.)@*4F%C6pre.3^gL8u+.)$Ja1)1K2.)/us'4`1iv?[x[AX"
">DQk=&2SfL>4-m'3HBMu2:nmL3Bi-McE;,)odGb@L.N'MU@9C-]?KoLDulhL#w5D-#TVA./JE/Lq>eA#/'+Q8l]9C,8&B.*5XKb@@hsPM2.VfLFI8GVRmDGV+:2X-*<dq)mAn9M3>6##"
"#+d;%$9P-4avK'#?3B:%V::8.mNv)4#Vpr6xXl<:-%eX-Si(?#LR(*>=:mp1J4@]u2NVE87mV)4lKxnLI_lS7#e$YYd>h>fjqBj$S>1T2&idh#WNc]u,VoH+/^(B#dS3N0_HDbA:lD)%"
"rNHAOYMYGMDtJfLXqd##Q3=&#d72mLvG(u$+dfF4<BPF%MPEb3:]Me.d(4I)(P;e.)_K#$^n;#MjXGp%jDJeM20P.)'9_-2[x):8,VjfLQJa0V*#4o7dD24'^bO-)GX3/U@@%P'9/8b*"
";XmGA9Gw;8i=I`(sZhM'8A]?cof-6M>Awx-tS<GMRoS+MWWB@#WG9J'P@)?uNUYI8#-EE#[Yw_#;R,<8+b?:3LljD3Yr@/LGVOV-D'%29M#_B#4ZCD3S)&T/29orNwJ1N(e]YD4Oea,*"
"-4h0,>4vr-4Hc#6<-C]$N>.U%))^Y,SEW-$$;(v#B%C7&D$KH2;YvAupvh4L]/8$$n=x_uGM1-Mh?^;-0@;=->?DiL9El'0dWe`*>(t.L&A3/LnQE?#HnMR8HeFatBUj'0i%s^#X-L4."
"mV-6M3:#gL=E5',2F_oA&>uu#R%=cMEjV&#[S@^$Ki@@-s3emLjnU6v0w)-vjKJ_MYF$##iBBY$@Y6iL*JqY-M=#/?'.^.?\?@i%aI%'0%KGY##CoRe*5nOJ(h5.)*jr/+*dg0aYctH##"
"6^TlS;4T=YPuG;-K6^/N4i`>$agNe'Qk[X'ep.'5ab5'5uX(T73OWV$Pi[+MT([##PG<A+q^EM0Ue$##`q-q$V2Cv-b%w20tt?X-BL75/#(KU)N0;hLr75c4br9s-;va.3exLG`^U;4F"
"RcG$0%IFL#[/;Zu[$^iB841'5Po7/Lb2=CLIw[%=En$SV8J$1,(dWIL=#gr/agM%O1Q;>5@R<=$/rVB#kwF>#euita$X82LhuA&GBihNXcIIa4u<'8@Pc&6/-@XA#R4r?#fgGj'x%MT/"
"ObE]-QtfM'-Wgf16HSP/kK(E#_3rhLE)t1)ter0,7D?whd]g^%11uU&FIJa^d/Gb%QIsYlG4`;$]Ya7Q.sc7Iw<6AO2CL97I)Ta#?u//LEJS8/^wJ/rD,?V%O)8'.<aMhLmME.h>x4Au"
"%<dD-$EmD-.]GW-sROwBG/5##iGIg:;,>>#*AY>#.Ml>#2Y(?#6f:?#:rL?#>(`?#B4r?#F@.@#JL@@#NXR@#W<Bu$%QcdGjr_hCi'-[Av)/:C*oIbHnQ`=BG)boM0$%oDT#0V)uMX]F"
"YNM<Br,9kEix@qC,dKSDm*;iF%jcdG]p[9C+1#wGxT;]A8X0DIaZ=b$cf3PCaT79CfxBVC1#lVC_S@UC?SvLFu@jx&D$L3C)Z_(%u2J:C6sXdM)6RgFn#_(%/xn'ItR/vGj;_$&SEb3O"
")Bl'&3,R['3pitBlq>LF9n8AtHKCw/";
static const char IGFD_compressed_data_base85[5965+1] =
"7])#######,#8oo'/###O@?>#+lQS%Ql#v#X^@iFLYQ^OT-$##^,'##l7W=BBaB]O:^Ee-]br-$KQshF>RA>#l)%##h$bw'Xnq0F<Eo9#M(Vw02)[w'O4>RDQjUw#/SD_&8Jq-$Mu@['"
"b3K'=-gK_&UKo-$fZIkENjH@=H7'##c-%##BK@0FvhC:3%H(F7YWo-$t4GkOR&###U::d?odPirVEL8eVNm&#+Yk>3.r9#v;/9m$W;Mt-].=GMM%g+MPXZ##/C2=-r.TV-vtXR*?=th#"
"P@OX(/#4&+5OOX(uue+MQxSfLaH<mL$ScS.mEexF,r:T.TP'##?LP)NCL,hLxMOd$nGZ(%@Y6iLMhrr$C'%Z$%.Z;%W^M_&+TL_&#r#Z$;.t-$M8###$9T;-Bw_ENW2ZpLV+$<-:b%Y-"
"Z?*1#JAuu#e:md.4Dc>#([FU%Z+6;-7k+/(bV4q$p[dK'3EU?+T'<*2.x&n7fKPHC;FrmIxA^aV[wHWl(3TWcZ]1_3-sS:vk)sW#wRMq2ebxr2m7VQICfQq2wAvr2j&al#%.=G24;V`3"
"WP$^5-uYS.HDW)#^2^V-GhsL#FfgWhNL`Qjj?I##.GY##2Sl##6`($#:l:$#>xL$#B.`$#F:r$#JF.%#NR@%#R_R%#Vke%#Zww%#_-4&#c9F&#48qK-PY5<-r]gC-g?u`3a6YY#2>uu#"
"[[qr$KnQS%Dwmo%@(.m/w)35&'2NP&/PP8.p<jl&7<fp&mE/2';ZlS.UNJM',WjfL&f6Bt`k'hLgE:*WVU=_/(rU/#swW)#u^ChL>TT401k%##ms*##JMl-$=*+##M`###]4$##t-[Y#"
">v&##je+gL]2#957*vM($i?X-,BG`a*HWf#Ybf;-?G^##rZ+,/$),##G=G6s37[0#O,>>#Xq.[#T;i`3twC.33qM>Pw+gF4p9%J3r4Z##<Ob'@e;dmL8R<hDjGW]'Hg1#$RhJn/'(J`t"
"pm'r0r'K-<5vLp.Sv74pMZu=(5K-5-bG,##<b_E[xXM2L.)+eZ'1E'Swu4;-$lL5/bkh8.E7TfL7.SY.n,Ih(Lv_>$u7XI)E$X=$FR]tuVbxX#KF-,$6+hF4Ns5c]5]4xt(l0o`HG]Y,"
"V=SqFs-*#/>BxY-2>6=1SS@n3BQQY>.8dA5K;6xtBE3muG?$##$&>uuZgUV$kxw%#vkM*IXP@&4A3jm.C:6u6wcmEM1Ha%$WuW?u-qvJ;oCR=lMqEl<+`teFnwrquoiD>LD;0^%DMxdP"
"hp9.1JY@W.&s_dsmn4VuV#,F@(.P/L+Qsr-Jx+na.J'f)u%Fs.W*?1/?D,c4kjSe$sC9C4/_XX$/%uN+eMRG#u:be)Jq5S7.u1B4:*2cu`v<D#K`8=6f-Z(sC#s5*/,vjuXD*e)&/I/p"
"h/1u$(EAX#0C'r.>dUucXJ<Y5M,JfL&_YgL0Mh'#0JE/LQiou,<@,87'n>PAhDQiKRrd+V(4)##cT^:/x)Qv$lf/+*s<RF4hcvH2:=]:/:5Rv$t@0+*5HSF4sWx?QJff0VSt<P(/2:kF"
"_p*P(*o;kF7Gs.LSbuN+aU;p.hH@E+p^2I-#kJe$%N-@'RE%Z$[6H]u`$G(/o`Z3L)>j$bew,?8`p&<A51rd-]qsD&`$O]#E]J]u%o^>$@+K`t/uB#$EFG]u8neF@):lbMF;#gL%*'-#"
",&>uuV/bo7*5c&#fiES7+N5^#%x-20p'2cige1ci'e4@'_o-'57:PS7.Anx45iNh#T[1^#KGxA-)^)/V6*;Ga%.%P.o5[o7T7rW-<k@K*)/#GiS4,AuY_C#$k&)I7V_^eAsP&'#)&>uu"
"XhFH(AkC?8@-/Z$vIPS.p'2ciOU;f'c^L7#*T$ct;hq.VEJnA-=Yaa-]8Xd4n#W,-]90[0HRq/#n2^I$oAhhLZoC:%S:Ls-%/65/#&AA4M7GgLwuYA#vTa@uD;Rc<^^xOS<,Qb%ps^^#"
"i>Mt-C6bOMZYBcNwVhw'*qx[ui.suL'x?>#+10ip&ExrQF7$##lnr?#&r&t%NEE/2XB+a4?c=?/^0Xp%kH$IM$?YCjwpRX:CNNjL<b7:.rH75/1uO]unpchLY.s%,R=q9V#Ap(#?j;A+"
":71gC>-(,)Xn$##OZ'u$P0;hLE(e8/)$fF4#b-)*oFn8%0#qg-8nxZT6hwLM>Vt,4u3YD#<)]L(_[`V$8.g[uMw+Yu:bCB#P'?87J.9Z%HnsT%c]9c;P3tT%vLE5&nrR>?XELO'5$eEj"
"QVF;-F%r<1F;W+M>T-C#`Ic>#$a=P/eLgw%p:to7?K8?#-W*=&JZuu>=%vrbdDDO'IH$h%BG:;$06u%4Zu^##9kfi'0fJV6&(Gd30d%H)O([F%AwRKW;hL+*bhZV--3.)*S(Ls-SRUa4"
"J]2m9'N;h)77t[$N'^:/V_TfL^UiS%R*hr/j(0'5VZe1gg81k5P#u,0'&L_(>H]m(UDOo7995O0eH@E+c$N9`lSFEXHC)159i>;-J,%15U$$gNTQD15'TXB,3[,.)+4850&CfU+3-g[u"
"f/5##d98q`07[0#9%T*#?3B:%isAv-&O]s$Oaf;-Vnt(0ff]Y,k(TF4VD>8.Rq@.*,[jd3WH5<.*M4gL8=sB#TekD#3YJ,3VG+G4XX48nw8<cDMa]iuium9)w@eD+ZA-1)`Q1EB9A)X&"
",4Tba5?I.M`3q7/u[tfd]s0$d0C9E#enTtQ&(oqL^)sB#`:5Yu9A;TFK`PhLp:s#26B]C8rKYV(`Lxw#M=DmLTuW1)xv@=(`()?#B8WeFW-u?-qx8;-O_94.`&Vf:[(LB#6'PA#5hUhL"
"S.%^$RWNj1IUFb35K^I35i4f)_Y_Z-Mx;=.Z&f.:a[xw'2q'Y$G38$5Zs<7.;G(<-$87V?M42X-n+[w'1q-[Bv(ofL:BqE%)8[0#8xL$#G&BkL*^(u$+dfF43c?X-$X>r%1]`6&[:^8/"
"AV@n&SQ#]#%2k3GSk4#G5GSS7s<YY#@fbF']6=t$aAg;-g48Z&11L-M4(ZIu9q0gaL02B#`4H^tP)^5'YC/r/mFw;8&HAB$F*#dM@=?Z$*fF.#=F.%#bWt&#M3>V/2T/i)HrUv-F^?d)"
")2pb4YIYjLeC0@#H`G>#KjE.3Z_[@#1N.Q@2eV5*k+)ul=^hA4+;wA4-l2%bt_NPoN%g1BYb]+42bMjLXF8:La,3.M58+**/)RW%$=h1B-n4GVaVQu.gm^6X,&Gj/$),##RN&I$S6[0#"
"WH?D*@p*P(PZg@#.Zg*%>@*T.jAqB#^WgO0qHm0)mK][#AK%g:$U&A$j^pn&sNfU+%aMu54+0AXNgAE+'BXe$PnpF&#(7G;R(mcaJVoW&'IG,M1KUv-`fWI)9jDR:-rR_#a?7f3lCgG3"
"N5<N0uX@8%5Y,>#r:N&l,=GNGA5AZ$XA`0(Q^(k'(GB.WKx+M/mi5###%D1MBZY8/J=jl&C?E`HO_Ur8eJdj'lx8B+kDA>,oZ_L#'i;A+v5+KMMsJfLfNB/LF7$##Sg'u$U^nENg:Cv-"
"gc``3-W&dMKQL,3L1O058b4-5mS4'5841'5%J/GV/1:B#'at%$q^DIM=X0DMg*^fL6)0/Ldbb(NRdimM-a4o7qPa>$cMDX:W<=&5R^i'#C.0u$CGF&#]rgo.X7-i&h0`.3f`aI)wuj=)"
"V_TLpB9o*%j70.)@*4F%C6pre.3^gL8u+.)$Ja1)1K2.)/us'4`1iv?[x[AX>DQk=c;q8gV3t_&o,7Au2:nmL3Bi-McE;,)odGb@L.N'MU@9C-]?KoLDulhL#w5D-#TVA./JE/LA$jE#"
"W9k(&<VYV-GfJ/L@i6o7:fKb@'x_5/Q1wPMIR0cMmbR`aRLb>-9jW^-R3n0#%3coLTq&%#N,>>#MhSM'@AxiLTj+c4A]DD3mMWB#,5Rv$g&?a3>nvGMeANv>s#V&1iJ&%bE2ZA#-.^g1"
"j;R)4443%b7RU`u`Kk(NHbeV@gJS'-BWcP3m?+#-VaDuL:`WY5kEaau^=lJ(_24J-KxeQ-):Im/9(V$#lpB'#.::t%h/oj2Y%@+<-H0Z-3R-b[k&qg3B)t1)O$pH*adP/(HZ%12ARj-$"
"h4-/V1(bT%xl`@$$F/a*/PDh'J3no[Uo5o7DAS?cvJm%$+99T([t&2BJODL5nctW#Aj*.)sA'%MS>`1p%bpK(i`2iK.K+<AZ4QS7$o45AhXv,4:O*r8dGAx$S6[0#G?O&#DoA*#_>QJ("
"PGpkL'(MB#/T01YP6;hLqS&J3LR(f)9*SY-_l-l)3RXD#+UR29awZp.Z9OA#RcB##Oi./LlA)ZuTBqn'B]7%b/WM<LrFcS7XOtILd9b<UxX'^#)J/Dt]il3++^tpAu_L%,w$[gu5[-['"
"#**&+(a%0<O4h=#%H3'50S6##l9f/)m`):)t1@k=8?#]u3i8-#Z]e^$U@;m'1rTxTW.p=YO*o>IFca,$_WAM$8&H<-YZ&v.&,###f0c-6?LN`<2cm9KRIG,M=P?uu5kBYt5Av7vds<n/"
"I^''#n6[0#K+pGM.;qY-M=#/?'.^.?\?@i%aoevu#)_?o[Ehv`E334m'qI`8.m#.)*m2Cm/+gB.*hbtM(xqoZ$AI@X-vx?C#fgNv6JZm3+,=ucu;oIH#3jDA=O#Z@CnGO._`OmD>OdJ._"
"(5G>#WtOO0h7<&Z.vW1u(x,V#dqbWB$f=<BpumUdn]0CIB@LG34oguPvwOL2<Lx'5`dBjrK76>#/JWfLl>T%#KSj**i%^F*0]WF3mx,.'mK$)*.:^^'ffo45P::&5;f^%%+GH##o-'O'"
"Y&R**Jx%ctG@l(5ewTs/`9>#>h(jw$6@%%#aKb&#*Q?(#kr/e=]6F_&$-2K(=5MB#=s+4/]p*P(5ZGb%+56J*qSc8/+gB.*kHx6,IC7`%UQspA=KGSIULS:d=vRdu75]CuOq$0ufu'L#"
">Y[OVk1k3G(kZoAO9iQN'h5',b_mL,v?qr&4uG##%J/GV5J?`a'=@@MB>O_$kU:3t2ro&$)Xff.P=#+#0w)g%RR$v,Rapi'W#:u$`Ld5/UXUa4eU`v#cJ?C#=V&E#;lm=72q_F*`V(a4"
"kYF0M'm3KV2kblA.,IE3EvoM^h<ffLw.@V%&te<$&ISZlG[C^ucc7[#(%M4'1/Pp7llL#$J=dD-:_Yw.02SB+5ji?B17m0)q:O]uj5&Y-Xn8e?$r]*@-EGb%0B0%M]1oo%qx8;-I#An$"
"kkfi'QPW]+nBIP/(N#,2U:k(NL#fJM;XYHM@C5)NG`Ps-*VsfL1cA+M1Rn20I.$##GiFo[+6_t(%KP`<8m7T*`qsCP]DLlSLV[bMq#?W-:l<U)uLbA#'SFAuBFmeOZ4pfL5sJfLZ*a=-"
"Y&NjO5M5V-c*t^-e`:G%tr[fLZ6qE%u8[0#dEqb=dlFl;Hb`t-MHLfL:WhLp'Wp$bZhoLp7rWh#l'02'wY12')^:kb@5nCWcHP+MWTblACEcf(G3V'#hpi8v)Tq3v5#r&Nh/df((wd--"
"h;4V-/wtCWGe]9AVQ)T7o<#5A^_R`a>_en*4#s%u*;Gc-0'cw'V9dxu#pT_A10R`Act3gNnnt;.o>*584B4_A(v0kX%i0^#tEWS%C5$##*J(v#.c_V$2%@8%6=wo%:UWP&>n82'B0pi'"
"FHPJ(Ja1,)N#ic)R;ID*VS*&+Zla]+_.B>,cF#v,g_YV-d,=&F.$jtBdMd<BgEbb$?VEj0.U9GHb/#gC%]'S)?9?OCql^oDoVTSD,KTKF#S7+HLZ2dETrGMO0=pa#ha8jBgWiTCl:MhF"
"djo/C:J6lEw`C*Hix@qC,dKSDm*;iF%jcdGp=HoD8LofGVp[9C+1#wGxT;]A8X0DIaZ=b$k(4PCaT79CfxBVC1#lVC_S@UC?SvLFu@jx&;v&I?&4;hFwf1eGG)R#5sS4VCoC%eG1PM*H"
"sH%'IlUDlEllL*HFmo?Md==aE>9rqLNiO7M13@_%r-<qM6cx6*9LHSD2dxuB2#RD%w(HPE'EUc$;q*dE?####";

17 changes: 14 additions & 3 deletions CustomFont.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,41 @@
#pragma once

#define FONT_ICON_BUFFER_NAME_IGFD IGFD_compressed_data_base85
#define FONT_ICON_BUFFER_SIZE_IGFD 0xf6e
#define FONT_ICON_BUFFER_SIZE_IGFD 0x174d

#define ICON_MIN_IGFD 0xf002
#define ICON_MAX_IGFD 0xf1c9
#define ICON_MIN_IGFD 0xf001
#define ICON_MAX_IGFD 0xf26c

#define ICON_IGFD_ADD u8"\uf067"
#define ICON_IGFD_BOOKMARK u8"\uf02e"
#define ICON_IGFD_CANCEL u8"\uf00d"
#define ICON_IGFD_CHEVRON_DOWN u8"\uf078"
#define ICON_IGFD_CHEVRON_UP u8"\uf077"
#define ICON_IGFD_DESKTOP u8"\uf26c"
#define ICON_IGFD_DOWNLOADS u8"\uf019"
#define ICON_IGFD_DRIVES u8"\uf0a0"
#define ICON_IGFD_EDIT u8"\uf040"
#define ICON_IGFD_FILE u8"\uf15b"
#define ICON_IGFD_FILE_GRID_THUMBNAILS u8"\uf00a"
#define ICON_IGFD_FILE_LIST u8"\uf0c9"
#define ICON_IGFD_FILE_LIST_THUMBNAILS u8"\uf00b"
#define ICON_IGFD_FILE_PIC u8"\uf1c5"
#define ICON_IGFD_FILM u8"\uf008"
#define ICON_IGFD_FOLDER u8"\uf07b"
#define ICON_IGFD_FOLDER_OPEN u8"\uf07c"
#define ICON_IGFD_HEART u8"\uf004"
#define ICON_IGFD_HOME u8"\uf015"
#define ICON_IGFD_LINK u8"\uf1c9"
#define ICON_IGFD_LINKEDIN u8"\uf0e1"
#define ICON_IGFD_MUSIC u8"\uf001"
#define ICON_IGFD_OK u8"\uf00c"
#define ICON_IGFD_PICTURE u8"\uf03e"
#define ICON_IGFD_PLACES u8"\uf0c8"
#define ICON_IGFD_REFRESH u8"\uf021"
#define ICON_IGFD_REMOVE u8"\uf068"
#define ICON_IGFD_RESET u8"\uf064"
#define ICON_IGFD_SAVE u8"\uf0c7"
#define ICON_IGFD_SEARCH u8"\uf002"
#define ICON_IGFD_SHORTCUTS u8"\uf233"
#define ICON_IGFD_STAR u8"\uf005"
#define ICON_IGFD_STEP_FORWARD u8"\uf051"
47 changes: 47 additions & 0 deletions CustomFont.ifs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<project>
<font name="Roboto-Medium.ttf">
<prefix>RM</prefix>
<genmodeflags>1297</genmodeflags>
<pathfilename>..\ImGuiFontStudio\3rdparty\imgui\misc\fonts\Roboto-Medium.ttf</pathfilename>
<oversample>1</oversample>
<fontsize>50</fontsize>
Expand All @@ -13,16 +14,25 @@
<freetypemultiply>1</freetypemultiply>
<padding>1</padding>
<filtering>9729</filtering>
<enabled>true</enabled>
<collapsed>false</collapsed>
</font>
<font name="fontawesome-webfont.ttf">
<glyphs>
<glyph orgId="61441" newId="61441" orgName="music" newName="music" trans="0;0" scale="1;1"/>
<glyph orgId="61442" newId="61442" orgName="search" newName="search" trans="0;0" scale="1;1"/>
<glyph orgId="61444" newId="61444" orgName="heart" newName="heart" trans="0;0" scale="1;1"/>
<glyph orgId="61445" newId="61445" orgName="star" newName="star" trans="0;0" scale="1;1"/>
<glyph orgId="61448" newId="61448" orgName="film" newName="film" trans="0;0" scale="1;1"/>
<glyph orgId="61450" newId="61450" orgName="th" newName="file_grid_thumbnails" trans="0;-192" scale="1;1"/>
<glyph orgId="61451" newId="61451" orgName="th_list" newName="file_list_thumbnails" trans="0;-182.857" scale="1;1"/>
<glyph orgId="61452" newId="61452" orgName="ok" newName="ok" trans="0;0" scale="1;1"/>
<glyph orgId="61453" newId="61453" orgName="remove" newName="cancel" trans="0;0" scale="1;1"/>
<glyph orgId="61461" newId="61461" orgName="home" newName="home" trans="0;0" scale="1;1"/>
<glyph orgId="61465" newId="61465" orgName="download_alt" newName="downloads" trans="0;0" scale="1;1"/>
<glyph orgId="61473" newId="61473" orgName="refresh" newName="refresh" trans="0;0" scale="1;1"/>
<glyph orgId="61486" newId="61486" orgName="bookmark" newName="bookmark" trans="0;0" scale="1;1"/>
<glyph orgId="61502" newId="61502" orgName="picture" newName="picture" trans="0;0" scale="1;1"/>
<glyph orgId="61504" newId="61504" orgName="pencil" newName="edit" trans="0;0" scale="1;1"/>
<glyph orgId="61521" newId="61521" orgName="step_forward" newName="step_forward" trans="0;0" scale="1;1"/>
<glyph orgId="61540" newId="61540" orgName="share_alt" newName="reset" trans="0;0" scale="1;1"/>
Expand All @@ -34,12 +44,17 @@
<glyph orgId="61564" newId="61564" orgName="folder_open" newName="folder_open" trans="0;0" scale="1;1"/>
<glyph orgId="61600" newId="61600" orgName="hdd" newName="drives" trans="0;0" scale="1;1"/>
<glyph orgId="61639" newId="61639" orgName="save" newName="save" trans="0;0" scale="1;1"/>
<glyph orgId="61640" newId="61640" orgName="sign_blank" newName="places" trans="0;0" scale="1;1"/>
<glyph orgId="61641" newId="61641" orgName="reorder" newName="file_list" trans="0;-124.675" scale="1;1"/>
<glyph orgId="61665" newId="61665" orgName="linkedin" newName="linkedin" trans="0;0" scale="1;1"/>
<glyph orgId="61787" newId="61787" orgName="file" newName="file" trans="0;0" scale="1;1"/>
<glyph orgId="61893" newId="61893" orgName="_425" newName="file_pic" trans="0;0" scale="1;1"/>
<glyph orgId="61897" newId="61897" orgName="_429" newName="link" trans="0;0" scale="1;1"/>
<glyph orgId="62003" newId="62003" orgName="_528" newName="shortcuts" trans="0;0" scale="1;1"/>
<glyph orgId="62060" newId="62060" orgName="_582" newName="desktop" trans="75.629;0" scale="1;1"/>
</glyphs>
<prefix>IGFD</prefix>
<genmodeflags>1307</genmodeflags>
<pathfilename>..\ImGuiFontStudio\samples_Fonts\fontawesome-webfont.ttf</pathfilename>
<oversample>3</oversample>
<fontsize>50</fontsize>
Expand All @@ -51,6 +66,8 @@
<freetypemultiply>1</freetypemultiply>
<padding>1</padding>
<filtering>9729</filtering>
<enabled>true</enabled>
<collapsed>false</collapsed>
</font>
<rangecoloring show="false" hash="42.606;14.789;27.817;0.5"/>
<previewglyphcount>20</previewglyphcount>
Expand All @@ -76,9 +93,39 @@
<showadvancex>false</showadvancex>
<glyphdrawingflags>1535</glyphdrawingflags>
<finalselection>
<selection orgId="61441" font="fontawesome-webfont.ttf"/>
<selection orgId="61442" font="fontawesome-webfont.ttf"/>
<selection orgId="61444" font="fontawesome-webfont.ttf"/>
<selection orgId="61445" font="fontawesome-webfont.ttf"/>
<selection orgId="61448" font="fontawesome-webfont.ttf"/>
<selection orgId="61450" font="fontawesome-webfont.ttf"/>
<selection orgId="61451" font="fontawesome-webfont.ttf"/>
<selection orgId="61452" font="fontawesome-webfont.ttf"/>
<selection orgId="61453" font="fontawesome-webfont.ttf"/>
<selection orgId="61461" font="fontawesome-webfont.ttf"/>
<selection orgId="61465" font="fontawesome-webfont.ttf"/>
<selection orgId="61473" font="fontawesome-webfont.ttf"/>
<selection orgId="61486" font="fontawesome-webfont.ttf"/>
<selection orgId="61502" font="fontawesome-webfont.ttf"/>
<selection orgId="61504" font="fontawesome-webfont.ttf"/>
<selection orgId="61521" font="fontawesome-webfont.ttf"/>
<selection orgId="61540" font="fontawesome-webfont.ttf"/>
<selection orgId="61543" font="fontawesome-webfont.ttf"/>
<selection orgId="61544" font="fontawesome-webfont.ttf"/>
<selection orgId="61559" font="fontawesome-webfont.ttf"/>
<selection orgId="61560" font="fontawesome-webfont.ttf"/>
<selection orgId="61563" font="fontawesome-webfont.ttf"/>
<selection orgId="61564" font="fontawesome-webfont.ttf"/>
<selection orgId="61600" font="fontawesome-webfont.ttf"/>
<selection orgId="61639" font="fontawesome-webfont.ttf"/>
<selection orgId="61640" font="fontawesome-webfont.ttf"/>
<selection orgId="61641" font="fontawesome-webfont.ttf"/>
<selection orgId="61665" font="fontawesome-webfont.ttf"/>
<selection orgId="61787" font="fontawesome-webfont.ttf"/>
<selection orgId="61893" font="fontawesome-webfont.ttf"/>
<selection orgId="61897" font="fontawesome-webfont.ttf"/>
<selection orgId="62003" font="fontawesome-webfont.ttf"/>
<selection orgId="62060" font="fontawesome-webfont.ttf"/>
</finalselection>
<fonttest>
<fontsize>100</fontsize>
Expand Down
Binary file modified CustomFont.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 16 additions & 6 deletions CustomImGuiFileDialogConfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,20 @@
//#define tableHeaderFileSizeString " Size"
//#define tableHeaderFileDateString " Date"

#define USE_BOOKMARK
//#define bookmarkPaneWith 150.0f
#define USE_PLACES_FEATURE
//#define placesPaneWith 150.0f
//#define IMGUI_TOGGLE_BUTTON ToggleButton
#define bookmarksButtonString ICON_IGFD_BOOKMARK
//#define bookmarksButtonHelpString "bookmark"
#define addBookmarkButtonString ICON_IGFD_ADD
#define removeBookmarkButtonString ICON_IGFD_REMOVE
#define placesButtonString ICON_IGFD_PLACES
// #define placesButtonHelpString "Places"
#define addPlaceButtonString ICON_IGFD_ADD
#define removePlaceButtonString ICON_IGFD_REMOVE

// a group for bookmarks will be added by default, but you can also create it yourself and many more
#define USE_PLACES_BOOKMARKS
#define placesBookmarksGroupName ICON_IGFD_BOOKMARK " Bookmarks"
#define placesBookmarksDisplayOrder 0 // to the first

// a group for system devices (returned by IFileSystem), but you can also add yours
#define USE_PLACES_DEVICES
#define placesDevicesGroupName ICON_IGFD_DRIVES " Devices"
#define placesDevicesDisplayOrder 10 // to the end
Loading

0 comments on commit d7bcd39

Please sign in to comment.