beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-27 01:50:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibGUI: Always outline selected date and paint today's date bold

Browse source 
Fixes selected dates and today's date not painting correctly when
viewed from adjacent months
This commit is contained in:
thankyouverycool 2021-04-02 12:19:33 -04:00 committed by Andreas Kling
parent 14e074cd24
commit dc6db819f9
Notes: sideshowbarker 2024-07-18 20:54:02 +09:00 
Author: https://github.com/thankyouverycool
Commit: https://github.com/SerenityOS/serenity/commit/dc6db819f91
Pull-request: https://github.com/SerenityOS/serenity/pull/6077
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -517,15 +517,14 @@ void Calendar::paint_event(GUI::PaintEvent& event)
}
auto display_date = String::number(m_tiles[0][i].date_time.day());
if (m_tiles[0][i].is_today) {
if (m_tiles[0][i].is_selected && width < 30)
painter.draw_rect(tile_rect, palette().base_text());
if (m_tiles[0][i].is_selected && (width < 30 || height < 30))
painter.draw_rect(tile_rect, palette().base_text());
if (m_tiles[0][i].is_today && !m_tiles[0][i].is_outside_selected_month) {
painter.draw_text(text_rect, display_date, font().bold_variant(), text_alignment, palette().base_text());
} else if (m_tiles[0][i].is_outside_selected_month) {
painter.draw_text(text_rect, display_date, font(), text_alignment, Color::LightGray);
painter.draw_text(text_rect, display_date, m_tiles[0][i].is_today ? font().bold_variant() : font(), text_alignment, Color::LightGray);
} else {
if ((width < 30 || height < 30) && m_tiles[0][i].is_selected)
painter.draw_rect(tile_rect, palette().base_text());
painter.draw_text(text_rect, display_date, font(), text_alignment, palette().base_text());
}
i++;
@ -627,13 +626,12 @@ void Calendar::paint_event(GUI::PaintEvent& event)
}
auto display_date = String::number(m_tiles[l][i].date_time.day());
if (m_tiles[l][i].is_selected)
painter.draw_rect(tile_rect, palette().base_text());
if (m_tiles[l][i].is_today && !m_tiles[l][i].is_outside_selected_month) {
if (m_tiles[l][i].is_selected)
painter.draw_rect(tile_rect, palette().base_text());
painter.draw_text(tile_rect, display_date, font().bold_variant(), Gfx::TextAlignment::Center, palette().base_text());
} else if (!m_tiles[l][i].is_outside_selected_month) {
if (m_tiles[l][i].is_selected)
painter.draw_rect(tile_rect, palette().base_text());
painter.draw_text(tile_rect, display_date, font(), Gfx::TextAlignment::Center, palette().base_text());
}
i++;