RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-19 14:42:07 +00:00
Code Issues Activity Actions

Calendar: Make the application theme-aware

Browse source
This commit is contained in:
rhin123 2020-04-07 23:34:00 -05:00 • committed by Andreas Kling
parent 7382b27c22
commit e91cb83a23
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Applications/Calendar/CalendarWidget.cpp
View file

@ -33,6 +33,7 @@
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibGfx/Font.h> #include <LibGfx/Font.h>
#include <LibGfx/Palette.h>
CalendarWidget::CalendarWidget() CalendarWidget::CalendarWidget()
{ {
@ -206,7 +207,8 @@ void CalendarWidget::CalendarTile::paint_event(GUI::PaintEvent& event)
GUI::Frame::paint_event(event); GUI::Frame::paint_event(event);
GUI::Painter painter(*this); GUI::Painter painter(*this);
painter.fill_rect(frame_inner_rect(), Color::NamedColor::White); painter.add_clip_rect(frame_inner_rect());
painter.fill_rect(frame_inner_rect(), palette().base());
painter.draw_line(frame_inner_rect().top_right(), frame_inner_rect().bottom_right(), Color::NamedColor::Black); painter.draw_line(frame_inner_rect().top_right(), frame_inner_rect().bottom_right(), Color::NamedColor::Black);
if (m_index == 0 || m_index % 7 == 0) if (m_index == 0 || m_index % 7 == 0)
@ -221,7 +223,7 @@ void CalendarWidget::CalendarTile::paint_event(GUI::PaintEvent& event)
if (m_display_weekday_name) { if (m_display_weekday_name) {
auto weekday_rect = Gfx::Rect(frame_inner_rect().x(), frame_inner_rect().y(), frame_inner_rect().width(), font().glyph_height() + 4); auto weekday_rect = Gfx::Rect(frame_inner_rect().x(), frame_inner_rect().y(), frame_inner_rect().width(), font().glyph_height() + 4);
weekday_rect.set_top(frame_inner_rect().y() + 2); weekday_rect.set_top(frame_inner_rect().y() + 2);
painter.draw_text(weekday_rect, m_weekday_name, Gfx::Font::default_bold_font(), Gfx::TextAlignment::Center, Color::Black); painter.draw_text(weekday_rect, m_weekday_name, Gfx::Font::default_bold_font(), Gfx::TextAlignment::Center, palette().base_text());
day_rect.set_y(frame_inner_rect().y() + 15); day_rect.set_y(frame_inner_rect().y() + 15);
} else { } else {
@ -232,8 +234,8 @@ void CalendarWidget::CalendarTile::paint_event(GUI::PaintEvent& event)
if (m_calendar.is_today(m_date_time)) { if (m_calendar.is_today(m_date_time)) {
int highlight_rect_width = (font().glyph_width('0') * (m_display_date.length() + 1)) + 2; int highlight_rect_width = (font().glyph_width('0') * (m_display_date.length() + 1)) + 2;
auto highlight_rect = Gfx::Rect(day_rect.width() / 2 - (highlight_rect_width / 2), day_rect.y(), highlight_rect_width, font().glyph_height() + 4); auto highlight_rect = Gfx::Rect(day_rect.width() / 2 - (highlight_rect_width / 2), day_rect.y(), highlight_rect_width, font().glyph_height() + 4);
painter.draw_rect(highlight_rect, Color::NamedColor::Blue); painter.draw_rect(highlight_rect, palette().base_text());
painter.draw_text(day_rect, m_display_date, Gfx::Font::default_bold_font(), Gfx::TextAlignment::Center, Color::Black); painter.draw_text(day_rect, m_display_date, Gfx::Font::default_bold_font(), Gfx::TextAlignment::Center, palette().base_text());
} else } else
painter.draw_text(day_rect, m_display_date, Gfx::TextAlignment::Center, Color::Black); painter.draw_text(day_rect, m_display_date, Gfx::TextAlignment::Center, palette().base_text());
} }