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 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 literal 10318 zcmY#%%PZmFVt@jl%&J7EoW$g8D1Ve14S~@R7!85Z5TI@d$S^Q4V8b9=VB#Ql9RmXc z2%CX81n@fs1_luR52ZnD5Ju*Mj8I@;V5nhWVED(tz#s=@zk%{W;w&IV3=9nCpym`X zFfdp^-3v1B8B`udNiZ-l*f20KI< z8bM+(K1d81gTz7dAa%$XBo1;Lhz9u+9K9Cp)Ba4H=2qX_u2NDO# zBV$mQfcP*P#74)+`q9G&q!u|GKz4xa0%4FGhz4O08)V0G1_lNY{?5R_04jUlLuqyf z1_n@i1E~Y4M>Z1_KcMhN#vpYd^N_``@j>b;7#J8paR4f_K;Z$yAU;SOBo9&tvLD?H znE4=akUU5ohz&CXM1#aZGz^2}iBShq4^juRALI@YAA~`6g4_neAaRg9NF7KV8RH5U zQ1}tTAoD z`atf7VGth~gVe$JFf||=CI+KH>Og)4`2{A1OoPNh@*s5}`;p~9e02AM)PdB4^dYMS zu|f8O#6e{fNF7K&NF0Vid~D$Y(gV^9Qiq(EKzxumNFHP!hz+tE9|oxd>BEIVX28rt zR|BfkKyn}qvjdxXATwYXWCkd{(AB}r0MQ^dFpNzdNDa(B7!6Vf3NKjN1Brv`22l9G z;shiQQU^+hAaPt6Bo9&t!Z5uswIFjr7-kPh4M;sm3>OB;gVcfKL2d{64a6rG!~6j< z59AI~%mLXCDsw^Q0LUF63}S=KfcX_fgX{pwA!CpjNF6c;nFq?RAUz-qVuQp$YC!hD zFvt#Mvp{T+7)Tv52I&RKfzk`Qc_4M5x*X(hkU9{JjzMaWF~|;(c`yv(gWLqt4>BKy zL4Jd&L8f75f$RaXK{PfDk^^Co9E=9B(J?3;!R!RlAiF?zW6S5Dbc3!Roe#1L8H4g9 zDC}SuWIhNZs{ye={s)PpV~`v&#-Lib(hpJx(vOTma>y9u7Eqc4g%v0-fb@XGU}|9D1qu%s8%BfD5=Et#qz_pQ%ubjXNFJmP9fQIF z6wk!;H_`Qu@<&5pGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$( KGz5ls2mk<4wRi^r diff --git a/FontEditor/FontEditor.cpp b/FontEditor/FontEditor.cpp index ebf01b140b..6d2e0c346e 100644 --- a/FontEditor/FontEditor.cpp +++ b/FontEditor/FontEditor.cpp @@ -43,7 +43,6 @@ FontEditorWidget::FontEditorWidget(const String& path, RetainPtr&& 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());