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

ClockSettings: Display a text bubble with extra time zone information

Browse source
This commit is contained in:
Timothy Flynn 2022-02-02 17:15:17 -05:00 • committed by Andreas Kling
parent 4d2ea773db
commit 362e167239
3 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Applications/ClockSettings/CMakeLists.txt
View file

@ -14,4 +14,5 @@ set(SOURCES
) )
serenity_app(ClockSettings ICON app-analog-clock) # FIXME: Create a ClockSettings icon. serenity_app(ClockSettings ICON app-analog-clock) # FIXME: Create a ClockSettings icon.
target_link_libraries(ClockSettings LibGUI LibMain) target_link_libraries(ClockSettings LibGUI LibMain LibUnicode)
link_with_unicode_data(ClockSettings)

31
Userland/Applications/ClockSettings/ClockSettingsWidget.cpp
View file

@ -5,6 +5,7 @@
*/ */
#include "ClockSettingsWidget.h" #include "ClockSettingsWidget.h"
#include <AK/Time.h>
#include <Applications/ClockSettings/ClockSettingsWidgetGML.h> #include <Applications/ClockSettings/ClockSettingsWidgetGML.h>
#include <LibGUI/ComboBox.h> #include <LibGUI/ComboBox.h>
#include <LibGUI/Event.h> #include <LibGUI/Event.h>
@ -16,6 +17,8 @@
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGfx/Palette.h> #include <LibGfx/Palette.h>
#include <LibTimeZone/TimeZone.h> #include <LibTimeZone/TimeZone.h>
#include <LibUnicode/DateTimeFormat.h>
#include <LibUnicode/Locale.h>
#include <math.h> #include <math.h>
#include <spawn.h> #include <spawn.h>
#include <unistd.h> #include <unistd.h>
@ -31,6 +34,11 @@ static constexpr auto TAU = M_PIf32 * 2.0f;
static constexpr auto TIME_ZONE_MAP_NORTHERN_TRIM = 78; static constexpr auto TIME_ZONE_MAP_NORTHERN_TRIM = 78;
static constexpr auto TIME_ZONE_MAP_SOUTHERN_TRIM = 50; static constexpr auto TIME_ZONE_MAP_SOUTHERN_TRIM = 50;
static constexpr auto TIME_ZONE_TEXT_WIDTH = 210;
static constexpr auto TIME_ZONE_TEXT_HEIGHT = 40;
static constexpr auto TIME_ZONE_TEXT_PADDING = 5;
static constexpr auto TIME_ZONE_TEXT_COLOR = Gfx::Color::from_rgb(0xeaf688);
ClockSettingsWidget::ClockSettingsWidget() ClockSettingsWidget::ClockSettingsWidget()
{ {
load_from_gml(clock_settings_widget_gml); load_from_gml(clock_settings_widget_gml);
@ -73,6 +81,21 @@ void ClockSettingsWidget::second_paint_event(GUI::PaintEvent& event)
auto point = m_time_zone_location->to_type<int>().translated(x, y); auto point = m_time_zone_location->to_type<int>().translated(x, y);
point.translate_by(-m_time_zone_marker->width() / 2, -m_time_zone_marker->height() / 2); point.translate_by(-m_time_zone_marker->width() / 2, -m_time_zone_marker->height() / 2);
painter.blit(point, *m_time_zone_marker, rect()); painter.blit(point, *m_time_zone_marker, rect());
point = m_time_zone_location->to_type<int>().translated(x, y);
point.translate_by(0, -TIME_ZONE_TEXT_HEIGHT / 2);
if (point.x() <= (m_time_zone_map->width() / 2))
point.translate_by(m_time_zone_marker->width() / 2 + TIME_ZONE_TEXT_PADDING, 0);
else
point.translate_by(-m_time_zone_marker->width() / 2 - TIME_ZONE_TEXT_PADDING - TIME_ZONE_TEXT_WIDTH, 0);
auto text_area = Gfx::IntRect { point.x(), point.y(), TIME_ZONE_TEXT_WIDTH, TIME_ZONE_TEXT_HEIGHT };
painter.draw_rect(text_area, palette().active_window_border1());
text_area.shrink(2, 2);
painter.fill_rect(text_area, TIME_ZONE_TEXT_COLOR);
painter.draw_text(text_area, m_time_zone_text, Gfx::TextAlignment::Center);
} }
void ClockSettingsWidget::reset_default_values() void ClockSettingsWidget::reset_default_values()
@ -97,6 +120,14 @@ void ClockSettingsWidget::apply_settings()
void ClockSettingsWidget::set_time_zone_location() void ClockSettingsWidget::set_time_zone_location()
{ {
m_time_zone_location = compute_time_zone_location(); m_time_zone_location = compute_time_zone_location();
auto locale = Unicode::default_locale();
auto now = AK::Time::now_realtime();
auto name = Unicode::format_time_zone(locale, m_time_zone, Unicode::CalendarPatternStyle::Long, now);
auto offset = Unicode::format_time_zone(locale, m_time_zone, Unicode::CalendarPatternStyle::LongOffset, now);
m_time_zone_text = String::formatted("{}\n({})", name, offset);
} }
// https://en.wikipedia.org/wiki/Mercator_projection#Derivation // https://en.wikipedia.org/wiki/Mercator_projection#Derivation

1
Userland/Applications/ClockSettings/ClockSettingsWidget.h
View file

@ -34,4 +34,5 @@ private:
RefPtr<Gfx::Bitmap> m_time_zone_marker; RefPtr<Gfx::Bitmap> m_time_zone_marker;
Optional<Gfx::FloatPoint> m_time_zone_location; Optional<Gfx::FloatPoint> m_time_zone_location;
String m_time_zone_text;
}; };