RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:17:36 +00:00
Code Issues Activity Actions

Calendar: Swap Liza for Marieta

Browse source
This commit is contained in:
thankyouverycool 2021-04-26 09:34:47 -04:00 • committed by Andreas Kling
parent 98ea44de36
commit 67f81adc55
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibGUI/Calendar.cpp
View file

@ -35,8 +35,8 @@ static const char* short_month_names[] = {
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
}; };
static const auto extra_large_font = Gfx::BitmapFont::load_from_file("/res/fonts/LizaRegular36.font"); static const auto extra_large_font = Gfx::BitmapFont::load_from_file("/res/fonts/MarietaRegular36.font");
static const auto large_font = Gfx::BitmapFont::load_from_file("/res/fonts/LizaRegular24.font"); static const auto large_font = Gfx::BitmapFont::load_from_file("/res/fonts/MarietaRegular24.font");
static const auto medium_font = Gfx::BitmapFont::load_from_file("/res/fonts/PebbletonRegular14.font"); static const auto medium_font = Gfx::BitmapFont::load_from_file("/res/fonts/PebbletonRegular14.font");
static const auto small_font = Gfx::BitmapFont::load_from_file("/res/fonts/KaticaRegular10.font"); static const auto small_font = Gfx::BitmapFont::load_from_file("/res/fonts/KaticaRegular10.font");
@ -477,7 +477,7 @@ void Calendar::paint_event(GUI::PaintEvent& event)
auto text_rect = Gfx::IntRect( auto text_rect = Gfx::IntRect(
x_offset, x_offset,
y_offset + 4, y_offset + 4,
m_tiles[0][i].width, m_tiles[0][i].width - 4,
font().glyph_height() + 4); font().glyph_height() + 4);
if (width > 150 && height > 150) { if (width > 150 && height > 150) {
@ -486,10 +486,8 @@ void Calendar::paint_event(GUI::PaintEvent& event)
set_font(large_font); set_font(large_font);
} else if (width > 50 && height > 50) { } else if (width > 50 && height > 50) {
set_font(medium_font); set_font(medium_font);
text_rect.set_width(m_tiles[0][i].width - 4);
} else if (width >= 30 && height >= 30) { } else if (width >= 30 && height >= 30) {
set_font(small_font); set_font(small_font);
text_rect.set_width(m_tiles[0][i].width - 4);
} else { } else {
set_font(small_font); set_font(small_font);
text_alignment = Gfx::TextAlignment::Center; text_alignment = Gfx::TextAlignment::Center;