RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:37:35 +00:00
Code Issues Activity Actions

LibGUI+TaskBar: Make Calendar::formatted_date() return ErrorOr<String>

Browse source 
This commit introduces no error propagation.
This commit is contained in:
Karol Kosek 2023-02-11 21:19:00 +01:00 • committed by Linus Groh
parent f802920a3a
commit b5cb9a9ebb
4 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@
*/
#include <AK/DateConstants.h>
#include <AK/String.h>
#include <LibConfig/Client.h>
#include <LibCore/DateTime.h>
#include <LibGUI/Calendar.h>
@ -332,20 +333,19 @@ void Calendar::update_tiles(unsigned view_year, unsigned view_month)
update();
}
DeprecatedString Calendar::formatted_date(Format format)
ErrorOr<String> Calendar::formatted_date(Format format)
{
switch (format) {
case ShortMonthYear:
return DeprecatedString::formatted("{} {}", short_month_names[view_month() - 1], view_year());
return String::formatted("{} {}", short_month_names[view_month() - 1], view_year());
case LongMonthYear:
return DeprecatedString::formatted("{} {}", long_month_names[view_month() - 1], view_year());
return String::formatted("{} {}", long_month_names[view_month() - 1], view_year());
case MonthOnly:
return DeprecatedString::formatted("{}", long_month_names[view_month() - 1]);
return String::formatted("{}", long_month_names[view_month() - 1]);
case YearOnly:
return DeprecatedString::number(view_year());
default:
VERIFY_NOT_REACHED();
return String::number(view_year());
}
VERIFY_NOT_REACHED();
}
void Calendar::paint_event(GUI::PaintEvent& event)
@ -376,7 +376,7 @@ void Calendar::paint_event(GUI::PaintEvent& event)
22);
y_offset += year_only_rect.height();
painter.fill_rect(year_only_rect, palette().hover_highlight());
painter.draw_text(year_only_rect, formatted_date(YearOnly), medium_font->bold_variant(), Gfx::TextAlignment::Center, palette().base_text());
painter.draw_text(year_only_rect, formatted_date(YearOnly).release_value_but_fixme_should_propagate_errors(), medium_font->bold_variant(), Gfx::TextAlignment::Center, palette().base_text());
painter.draw_line({ 0, y_offset }, { frame_inner_rect().width(), y_offset }, (!m_show_month_tiles ? palette().threed_shadow1() : palette().threed_shadow2()), 1);
y_offset += 1;
if (!m_show_month_tiles) {
@ -391,9 +391,9 @@ void Calendar::paint_event(GUI::PaintEvent& event)
22);
painter.fill_rect(month_year_rect, palette().hover_highlight());
month_year_rect.set_width(frame_inner_rect().width() / 2);
painter.draw_text(month_year_rect, formatted_date(MonthOnly), medium_font->bold_variant(), Gfx::TextAlignment::Center, palette().base_text());
painter.draw_text(month_year_rect, formatted_date(MonthOnly).release_value_but_fixme_should_propagate_errors(), medium_font->bold_variant(), Gfx::TextAlignment::Center, palette().base_text());
month_year_rect.set_x(month_year_rect.width() + (frame_inner_rect().width() % 2 ? 1 : 0));
painter.draw_text(month_year_rect, formatted_date(YearOnly), medium_font->bold_variant(), Gfx::TextAlignment::Center, palette().base_text());
painter.draw_text(month_year_rect, formatted_date(YearOnly).release_value_but_fixme_should_propagate_errors(), medium_font->bold_variant(), Gfx::TextAlignment::Center, palette().base_text());
y_offset += 22;
painter.draw_line({ 0, y_offset }, { frame_inner_rect().width(), y_offset }, palette().threed_shadow1(), 1);
y_offset += 1;