From b1e054ffe89475dea7110a06102d5ecbcc49a5cc Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 5 Feb 2019 09:07:23 +0100 Subject: [PATCH] Rename LizaBold to LizaRegular and LizaBlack to LizaBold. LizaRegular is quickly becoming my favorite bitmap font. It's so pretty :^) --- Base/res/fonts/LizaBold8x10.font | Bin 10318 -> 10319 bytes ...izaBlack8x10.font => LizaRegular8x10.font} | Bin 10318 -> 10318 bytes FontEditor/FontEditor.cpp | 1 - LibGUI/GButton.cpp | 1 - SharedGraphics/Font.cpp | 2 +- Userland/guitest2.cpp | 1 - WindowServer/WSWindowManager.cpp | 2 +- 7 files changed, 2 insertions(+), 5 deletions(-) rename Base/res/fonts/{LizaBlack8x10.font => LizaRegular8x10.font} (62%) diff --git a/Base/res/fonts/LizaBold8x10.font b/Base/res/fonts/LizaBold8x10.font index 23e9055a5f79db7d1cc5f42bef2f251e04be8fd5..5e1fb79f8dae7a435bde0832751cac06ad33a516 100644 GIT binary patch literal 10319 zcmeH~y=qiZ6opd=N{WkRiXrG5Sc%1D3JWV=La-5nT8M~*c{VG{`vexJ(niK~rWi)o zH#uwA9?s1qXeE2W%KklTpR*@FtkRvrGTwihGuKs*<>;%W82*O>er5lkW)Z^b7f_ago(Mw}=Z#WT^m z@8zTaMFgCO^j?QJi+Pcprw+(FCKpMbdJFR0341Pb-yW#PUi_QDcc1GW=L$1<-^1l1 z2l}n9^H#r?clmSYt2|>1Mw})_*VH-mfuA`s=X__ z6aiQVDE%EpzTA$q{in3VxKjzG2iQRZ+sVhE79M3)K0{OI8;&xqey;^)D53?uV;D= zee^ruv(}?_F7m#=f!~21_qYw1U&M{*J>vtv70V3QZ9SJ>1HDP)48$h~N?@F~Rvvn; z+≀Z7UAqBwA1I(S_(e_I6EAL_3$bh-jj3_TIZz-C!2z&2-Im+g|TNMbE@CgW1b! zi6;?^VoxLHc8%c+Ka=dvL=U#${jNoOlRnP2;0;lSc&LoMo2HMrRLbmOJ!{zR8>+)y zCUF$`Sy+qY4DX74*tg|-sRid-a>o|2hk0n;Z<`dmkNIZre*yZegBCuy7S^-nZbhU& zf>}jmC+ICia=Em4N@l5Ba_rM-j;!XbF?48eCZXh?18^{gh266+r ef!siDAUBX3$PMHMas#=6+(2$1H}L;%;P^LGn0K`R literal 10318 zcmeH}zlxJV6vYMQW06G`3lRxH!3VIC6cWT@D<5JM2?}A|LM$Yt@KJmfA*H2_VreBd zf>;I5FPW3Q8Nbg}vAhS)-oJBa=FAuI*73=UgUc5x9zJ{Z=)v>(6US*&fm9$BNCp0{ z0@pRJkL=<+{@u!}1m|F`I$T%V7c=6fcu#yOUaS67*^}yDk_E@&OuQp47s(9jfV^XJk>shjAior`K5yGYOg;AE{|S8dq2B3G zVIc2wxLo8w-_><%q|)YIycya<-V~C9+#9fVB;KgLXGN>hZXRok=sU7!C!#07QaciP zWA-VPd@tVje$AcA^3Cxd4c3-GxtkpGO|&bOoW=8e9==(6>7#DCuieAztew9X`n?w0 z7c2csexY0u<6MP%u(l+lzt^OI84!5hHah$3yx#%KOs_lZ+<&8(kA7TVREYEGi#oW* zejwfjo!?e|ll@SMe^KOp0Bhn*){6XU@68~ z>>Fe1pzRwg7yIx*dp>@fv&wir=WLm8-&U!e=IA&?`p}s7>Ld3ZiC`r%-x^$z&s~Vg zQwQBST6|w)a;Ds!|4#lV@w@mr=M9 zlh8MBtbD6W{FV<@=S|SuXQ2+3;?R3JPoLKfS+oE%H9Zycd`S zvIl31ccTv4KKJ?#SipTtrT^VPpRSTR7>VSENZoLc_wu)0)BwRmbiU702h8yOHi>`y z<9jfV{r(2*U&MuIUGaf+!cIlkZOOIpeY}=la-amp{XEb6(rb7gcVuRqN6)Ef9kDIx ziD>sFE+YFd-|V|DdmHQn+Wj1FtK0hT`r`M<-t58edt5E?N(3X(^M~xFG5k4^zZUt; zL1uZL+#SxluN%>cGeweX(at08Dr4_LL7YWgDrI)?JkPM*HB`sv8!6_uz-)4cbz3T7 z-QSxDSQ-PMM!CBqgYyr zjUZOR@0Xk}%pUJ`RV?R&Z|CosnKSofZyYY3?_E4saqsD?qx+8@znC9Avnyq8AUBX3 z$PN6*4O~^NKGMQ|^xKt}G0wnTak#Fs&!)t6@s9XXyi)Zil8dTekOYU~OuQvB(|)xd zNJbE&-pwkR`He{Zk0S7$_O|BW-`I&DcHUn?ih$djrmn#A{V|ttb`R)#GdteMfqBBKrhL zVh1AMm_DVF_u{^HtM6EnH}_EFYzdUQ@loGoccqe9T+j3HX2~UwxaqvMhtGL;elO(v zEV9p*`xpO-d_|0PWuAg}i!-dR- zr5NkbH`>HOn>Us(=AnajK7O0C$~d2WmejXyDcA1(u*V^i$By}4edN9)5v)Y&dk2@K za~Ev<#6foknHRhkIrCLqi|?zA&y>2;-%0-@eiuInKe@pB^Vull{-(;E1!8v%We(P( zKlOf)B=prA%ir!LzU6(z`6le#vk(VMap-&5PoB>WN!ME`HljNWgtdrT=fRpRSTP7>W3YNZfFad--h_B|tC{?eCMs0X2NT zjpHBx_#V`w-`{}#MLZF`S9IV#A*Z6_miSuuK0Zq>K2QQ=E%;n_mCvpS1f!siDAUBX3$PMHMas#=6+(2$1 TH;^014de!L1G$0RK)ZpT74gn# literal 10318 zcmeH~y=qiZ6opd=ip9k;#Srujti<9ng@u(b5v;@@79t{Hp3TbgK7qxlw2?8LDTdMY zP0kv&hjTLtTFG9pvVYIo=j_Q3dG!3vyL3(@^yOOC4}_6qnVvRM9_m&&Nu-iJQwrr(QR35@4>3k3B0tmm|GuWzGd5u+}B5#BAi z=*J#>G$5GMi}^u)+#gM!le-5y0k&7spI_toqEghSGw#JT=7IPYW_+vsDa-GoAJyKK zU5bD+QFE&}?inAT7xTTCz7OI?oWvoJm^^jB{8q#I!Pj4CW)2{343}>0U5YcDn#MYF%^Qm1&`Zzbo zsMq%RZ?Jd59MJZmVN&Ds001>$aXtuYukqat7j)10^udTPqJe zSMDC1rM49ZaT2X3_vk|O9(%i{C!(E8Ttqa{H+%10t8Oq0^k%x|x^1s_p`vGEnZfL3 zwZxMMMzN<6bGydyg`Y`wXQBsN@P5~#y-6QuTkwXcLp)T*-c8d-Tqja&& edited_ auto* info_label = new GLabel(this); info_label->set_relative_rect({ 5, 110, 100, 20 }); - info_label->set_font(Font::default_bold_font()); auto* demo_label_1 = new GLabel(this); demo_label_1->set_font(m_edited_font.copy_ref()); diff --git a/LibGUI/GButton.cpp b/LibGUI/GButton.cpp index c6347bb5f0..006c6a79c2 100644 --- a/LibGUI/GButton.cpp +++ b/LibGUI/GButton.cpp @@ -7,7 +7,6 @@ GButton::GButton(GWidget* parent) : GWidget(parent) { set_fill_with_background_color(false); - set_font(Font::default_bold_font()); } GButton::~GButton() diff --git a/SharedGraphics/Font.cpp b/SharedGraphics/Font.cpp index 0a9c30474a..3e3f11a6b9 100644 --- a/SharedGraphics/Font.cpp +++ b/SharedGraphics/Font.cpp @@ -58,7 +58,7 @@ void Font::initialize() Font& Font::default_font() { - static const char* default_font_path = "/res/fonts/Liza8x10.font"; + static const char* default_font_path = "/res/fonts/LizaRegular8x10.font"; if (!s_default_font) { #ifdef USERLAND s_default_font = Font::load_from_file(default_font_path).leak_ref(); diff --git a/Userland/guitest2.cpp b/Userland/guitest2.cpp index 64ca47966f..04fe429a37 100644 --- a/Userland/guitest2.cpp +++ b/Userland/guitest2.cpp @@ -34,7 +34,6 @@ private: ClockWidget::ClockWidget(GWidget* parent) : GWidget(parent) { - set_font(Font::default_bold_font()); set_relative_rect({ 0, 0, 100, 40 }); start_timer(250); } diff --git a/WindowServer/WSWindowManager.cpp b/WindowServer/WSWindowManager.cpp index 7e039a94fd..225f0afce2 100644 --- a/WindowServer/WSWindowManager.cpp +++ b/WindowServer/WSWindowManager.cpp @@ -123,7 +123,7 @@ WSWindowManager::WSWindowManager() m_front_painter = make(*m_front_bitmap); m_back_painter = make(*m_back_bitmap); - m_font = Font::default_bold_font(); + m_font = Font::default_font(); m_front_painter->set_font(font()); m_back_painter->set_font(font());