From b5e5f26a8223637d17ec4b4198be163ccdcc8dad Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Fri, 1 Mar 2019 02:50:50 +0100
Subject: [PATCH] Base: Add Csilla Bold 7x10 variant.

It's nice to have a thin and a bold variant to complement each other.
---
 Base/res/fonts/CsillaBold7x10.font | Bin 0 -> 10319 bytes
 LibGUI/GTableView.cpp              |   1 +
 SharedGraphics/Font.cpp            |   2 +-
 WindowServer/WSWindowManager.cpp   |   9 +++++++++
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 Base/res/fonts/CsillaBold7x10.font

diff --git a/Base/res/fonts/CsillaBold7x10.font b/Base/res/fonts/CsillaBold7x10.font
new file mode 100644
index 0000000000000000000000000000000000000000..391ab798ea625a2a4c43df229dbe09e86a7ee948
GIT binary patch
literal 10319
zcmY#%%PV2$Vt@kY;>?_!L<Oh(oD`_YC^Z@aqaiRF0;3^7%@B}aU|_(7LH2;;K(q=2
z1A`d@1A`EVg9n4ufN(tn1H(3`9uWUO5*wr)WUdVZ149%81A`O;0|SU10p)|(AbF5F
z5O!f;V8~-&U@(EYRfmCrp^SlnK?x*@gk_NI0I@-8KyCohccAJ(=7KN>l#h!7so`N@
zV8Dez@*uq+c@P^H2FZie!7xZ&9n>Ene}eoElS8IK>OdH#7Q{xD$Hz8+nvYG59X3G%
zVj#Og7^DnjHVlKrU>M|27zU{W`7I3^PoVGz#UBWR#6TD%4^juxF9&rmh>Z<{)Pd9|
zF)%PBFfcHH><6g>*~iAfzyQLaaDu4=nGaG2!WK|HAT~%GWDZE30@NIkSs*naaZox1
zrCX2~2!qst%mtYb!l1B&xdGigkbaQ)Aax)NQVZh4Fi0L|9!M|9d=Lit1B5|-fnkt3
zkb0P25RHwGO<fHR|AN%QFvva-2Jt~O2!q(@7$gqDAaM{4!XP(-_%ICf14ta?Zx9Vq
z2NH*=fzhBa0kL5;h>ebs^~1smWFANyq!tzqAUO~Q*#nXXVURqG2Ic=n3=9kh85kIT
zGB7Z_g<=q!30mHO)Pu?a5C*9SVNe<XVUQb>85kHq7^Duw2gL&nW8;I=fznbA0|SE_
zG+lzi1cX6+kT^&lqz;tkLH5ARL#9FEAbF5FkUb#%Fboohu|YIQ9-BIlI7l8DgVcfS
z2e|{}9*`U;Z^G;biC2IWF)%Q|#9%ZiAHdi!8l)5yAD}SDg+cN#b)dMyg+cxTsXGR>
z8x{t93=9k)IS?OYFGwDw4&-)x8021%y2lI*3^4qifq?;pL3Pn<1_lNY2FZccJ!4>C
zfZ=xx3=AOrje&sygkj<!bs+zM+yN6qra|H$d5}6#_=ET`4C14^7o-lP9;61@91t61
zFG&0kND%`A14uuJ55pinC`{C#;RVtIQVL7MFuOo}SeS#<gZLnIpzy&JXE1S)I+%U9
zXps9s>Ol4*V~{uuBbx^bZ)6OL15kW`;squSG7psRKp5s`SRMuOLE<0`Qitp=bo-F)
z1^E}bya1U8DpO$L1d<1t2MQmMI4%s52dP7rhuH(7VPOrTLFz#2LE^YDNFJmP<Q@<k
z<UbIfTntJVAiW^_U~T~MiNT=o1BDT&4uOR$hz-&U3nvf_vI8a$qd{UIb;uZG9!MUf
z2ZTXvkQhh}$Q~F5*#VM6#vn0}I%Eve3sM7$D|GWfeg*j%ghA>+G&)8$3&aN50WuGU
zL41&#K>9)E!!XEiFg3_D$P5q$*#n|M@dsifV~|-OIS>YkgJ^8(Kysk64mn-<FfcHH
z%4CokAPi!k0U5x+z<|pPkU206RSKuf85kHqc@323Ko~i{!4+XCYhZpxRs&*#+ys+@
z(I7F995O}^KM)@lw#e#0;SVzhM1%OC_yA#Kbs+s9d6*e68d(j94RQ-e9Vo0o=>x<D
ziGk!`VFaQ<=?O$5;{uQ(Gz`*@jzMljQwFa)L3V*K%v^MJpf~_wP@I4;sIP+Frvd2!
z*@<iphz$}0$suEq7z~5zbx?W%g&jyevO17|LE!;%7bv}f!Ve?{QUenQ$$>B^O@e3`
z2FZie!T9)SkUEh0$ZA00ip&SegVdp8klQIO3(?IS<&TEIXb6mkz-S1JhQMeDjE2By
z2#kinXb6mkz-S1JhQMeDjE2By2#kinU<v^N=)5>+{1P-T4Z<KcXv~ZS$)TXR0~iL$
zgT_Ze<B1>)5{D@TiG$4WWME(bVGtXJLt%=b<G;lW3=AKkbEoGS7#NN-FfgP;<zPxd
zbE_abK=>ro%xne*29TK`yI|@-Y>*fTgX{&V0bvjyBnMIlayJY+Ld}5jL26+0Js`EQ
W3=9k)3{nRY2VoE!BnHADH4FeinBda@

literal 0
HcmV?d00001

diff --git a/LibGUI/GTableView.cpp b/LibGUI/GTableView.cpp
index 59dc4a5c1c..c873291117 100644
--- a/LibGUI/GTableView.cpp
+++ b/LibGUI/GTableView.cpp
@@ -147,6 +147,7 @@ void GTableView::paint_event(GPaintEvent& event)
         auto column_metadata = m_model->column_metadata(column_index);
         int column_width = column_metadata.preferred_width;
         Rect cell_rect(x_offset, 0, column_width + horizontal_padding() * 2, item_height());
+        painter.set_font(Font::default_bold_font());
         painter.draw_text(cell_rect.translated(horizontal_padding(), 0), m_model->column_name(column_index), TextAlignment::CenterLeft, Color::Black);
         x_offset += column_width + horizontal_padding() * 2;
         painter.draw_line(cell_rect.top_left(), cell_rect.bottom_left(), Color::White);
diff --git a/SharedGraphics/Font.cpp b/SharedGraphics/Font.cpp
index 059506a470..f33c8d6747 100644
--- a/SharedGraphics/Font.cpp
+++ b/SharedGraphics/Font.cpp
@@ -33,7 +33,7 @@ Font& Font::default_font()
 
 Font& Font::default_bold_font()
 {
-    static const char* default_bold_font_path = "/res/fonts/LizaBold8x10.font";
+    static const char* default_bold_font_path = "/res/fonts/CsillaBold7x10.font";
     if (!s_default_bold_font) {
         s_default_bold_font = Font::load_from_file(default_bold_font_path).leak_ref();
         ASSERT(s_default_bold_font);
diff --git a/WindowServer/WSWindowManager.cpp b/WindowServer/WSWindowManager.cpp
index 9fc48eaf6d..d738bf8e8c 100644
--- a/WindowServer/WSWindowManager.cpp
+++ b/WindowServer/WSWindowManager.cpp
@@ -422,7 +422,10 @@ void WSWindowManager::paint_window_frame(WSWindow& window)
     m_back_painter->draw_rect(border_rect, middle_border_color);
     m_back_painter->draw_rect(outer_rect, border_color);
     m_back_painter->draw_rect(inner_border_rect, border_color);
+
+    m_back_painter->set_font(Font::default_bold_font());
     m_back_painter->draw_text(titlebar_title_rect, window.title(), TextAlignment::CenterLeft, title_color);
+    m_back_painter->set_font(font());
 
     if (!s_close_button_bitmap)
         s_close_button_bitmap = &CharacterBitmap::create_from_ascii(s_close_button_bitmap_data, s_close_button_bitmap_width, s_close_button_bitmap_height).leak_ref();
@@ -912,13 +915,19 @@ void WSWindowManager::draw_menubar()
 {
     m_back_painter->fill_rect(menubar_rect(), Color::LightGray);
     m_back_painter->draw_line({ 0, menubar_rect().bottom() }, { menubar_rect().right(), menubar_rect().bottom() }, Color::White);
+    int index = 0;
     for_each_active_menubar_menu([&] (WSMenu& menu) {
         Color text_color = Color::Black;
         if (&menu == current_menu()) {
             m_back_painter->fill_rect(menu.rect_in_menubar(), menu_selection_color());
             text_color = Color::White;
         }
+        if (index == 1)
+            m_back_painter->set_font(Font::default_bold_font());
         m_back_painter->draw_text(menu.text_rect_in_menubar(), menu.name(), TextAlignment::CenterLeft, text_color);
+        if (index == 1)
+            m_back_painter->set_font(font());
+         ++index;
         return true;
     });