beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 01:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibGUI: Shade Weekends in a slightly different background color

Browse source 
Now, weekends can finally be displayed in the Calender Widget as they
are supposed to. They even update when the settings are changed!
This commit is contained in:
Tobias Christiansen 2022-10-04 12:38:44 +02:00 committed by Tim Flynn
parent 170b8cad04
commit 4fdd916f26
Notes: sideshowbarker 2024-07-17 18:06:52 +09:00 
Author: https://github.com/TobyAsE
Commit: https://github.com/SerenityOS/serenity/commit/4fdd916f26
Pull-request: https://github.com/SerenityOS/serenity/pull/15469
Reviewed-by: https://github.com/trflynn89
2 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -459,6 +459,7 @@ void Calendar::paint_event(GUI::PaintEvent& event)
if (j > 0)
y_offset += m_tiles[0][(j - 1) * 7].height + 1;
for (int k = 0; k < 7; k++) {
bool is_weekend = is_day_in_weekend((DayOfWeek)((k + to_underlying(m_first_day_of_week)) % 7));
if (k > 0)
x_offset += m_tiles[0][k - 1].width + 1;
auto tile_rect = Gfx::IntRect(
@ -467,10 +468,16 @@ void Calendar::paint_event(GUI::PaintEvent& event)
m_tiles[0][i].width,
m_tiles[0][i].height);
m_tiles[0][i].rect = tile_rect.translated(frame_thickness(), frame_thickness());
if (m_tiles[0][i].is_hovered || m_tiles[0][i].is_selected)
painter.fill_rect(tile_rect, palette().hover_highlight());
else
painter.fill_rect(tile_rect, palette().base());
Color background_color = palette().base();
if (m_tiles[0][i].is_hovered || m_tiles[0][i].is_selected) {
background_color = palette().hover_highlight();
} else if (is_weekend) {
background_color = palette().gutter();
}
painter.fill_rect(tile_rect, background_color);
auto text_alignment = Gfx::TextAlignment::TopRight;
auto text_rect = Gfx::IntRect(
@ -780,4 +787,17 @@ void Calendar::config_i32_did_change(String const& domain, String const& group,
update();
}
}
bool Calendar::is_day_in_weekend(DayOfWeek day)
{
auto day_index = to_underlying(day);
auto weekend_start_index = to_underlying(m_first_day_of_weekend);
auto weekend_end_index = weekend_start_index + m_weekend_length;
if (day_index < weekend_start_index)
day_index += 7;
return day_index < weekend_end_index;
}
}

21
Userland/Libraries/LibGUI/Calendar.h
View file

@ -92,6 +92,18 @@ private:
virtual void doubleclick_event(MouseEvent&) override;
virtual void leave_event(Core::Event&) override;
enum class DayOfWeek {
Sunday,
Monday,
Tuesday,
Wednesday,
Thursday,
Friday,
Saturday
};
bool is_day_in_weekend(DayOfWeek);
struct Day {
String name;
int width { 0 };
@ -138,15 +150,6 @@ private:
Gfx::IntSize m_month_size[12];
Mode m_mode { Month };
enum class DayOfWeek {
Sunday,
Monday,
Tuesday,
Wednesday,
Thursday,
Friday,
Saturday
};
DayOfWeek m_first_day_of_week { DayOfWeek::Sunday };
DayOfWeek m_first_day_of_weekend { DayOfWeek::Saturday };
int m_weekend_length { 2 };