Skip to content

Commit

Permalink
custom font to render clock applet
Browse files Browse the repository at this point in the history 
use custom font to render clock applet.
configuration is available via gsettings/dconf-editor
  • Loading branch information
@dnk
dnk committed Feb 19, 2023
1 parent e504576 commit bff965a
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 6 deletions.
85 changes: 79 additions & 6 deletions applets/clock/clock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@
#define KEY_SHOW_WEATHER "show-weather"
#define KEY_SHOW_TEMPERATURE "show-temperature"
#define KEY_CUSTOM_FORMAT "custom-format"
#define KEY_USE_CUSTOM_FONT "use-custom-font"
#define KEY_CUSTOM_FONT "custom-font"
#define KEY_SHOW_WEEK "show-week-numbers"
#define KEY_CITIES "cities"
#define KEY_TEMPERATURE_UNIT "temperature-unit"
Expand Down Expand Up @@ -147,6 +149,8 @@ struct _ClockData {
/* preferences */
ClockFormat format;
char *custom_format;
char *custom_font;
gboolean use_custom_font;
gboolean showseconds;
gboolean showdate;
gboolean showweek;
Expand Down Expand Up @@ -184,6 +188,7 @@ struct _ClockData {
gboolean can_handle_format_12;

GSettings *settings;
GtkCssProvider * custom_font_css_provider;

const gchar *weather_icon_name;
};
Expand All @@ -197,6 +202,7 @@ static int clock_numbers = 0;
static void update_clock (ClockData * cd);
static void update_tooltip (ClockData * cd);
static void update_panel_weather (ClockData *cd);
static gboolean update_custom_font (ClockData *cd);
static int clock_timeout_callback (gpointer data);
static float get_itime (time_t current_time);

Expand Down Expand Up @@ -1319,17 +1325,17 @@ clock_update_text_gravity (GtkWidget *label)
}

static inline void
force_no_button_vertical_padding (GtkWidget *widget)
force_no_button_padding (GtkWidget *widget)
{
GtkCssProvider *provider;

provider = gtk_css_provider_new ();
gtk_css_provider_load_from_data (provider,
"#clock-applet-button {\n"
"padding-top: 0px;\n"
"padding-bottom: 0px;\n"
"padding-left: 4px;\n"
"padding-right: 4px;\n"
" padding-top: 0px;\n"
" padding-bottom: 0px;\n"
" padding-left: 0px;\n"
" padding-right: 0px;\n"
"}",
-1, NULL);
gtk_style_context_add_provider (gtk_widget_get_style_context (widget),
Expand All @@ -1348,7 +1354,7 @@ create_main_clock_button (void)
button = gtk_toggle_button_new ();
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);

force_no_button_vertical_padding (button);
force_no_button_padding (button);

return button;
}
Expand Down Expand Up @@ -1465,6 +1471,7 @@ create_clock_widget (ClockData *cd)
applet_change_orient (MATE_PANEL_APPLET (cd->applet),
mate_panel_applet_get_orient (MATE_PANEL_APPLET (cd->applet)),
cd);
update_custom_font (cd);
}

static void
Expand Down Expand Up @@ -2370,6 +2377,68 @@ custom_format_changed (GSettings *settings,
g_free (value);
}

static gboolean
update_custom_font (ClockData *cd) {
gboolean need_refresh_clock;

need_refresh_clock = FALSE;

if (cd->custom_font_css_provider != NULL) {
gtk_style_context_remove_provider (gtk_widget_get_style_context (cd->panel_button), GTK_STYLE_PROVIDER (cd->custom_font_css_provider));
g_object_unref (cd->custom_font_css_provider);
cd->custom_font_css_provider = NULL;
need_refresh_clock = TRUE;
}

if (cd->use_custom_font && cd->custom_font != NULL && cd->custom_font[0] != '\0') {
GtkCssProvider *provider = gtk_css_provider_new ();
gchar *css = g_strdup_printf (
"#clock-applet-button {\n"
" font: %s"
"}", cd->custom_font);
if (gtk_css_provider_load_from_data (provider, css, -1, NULL)) {
gtk_style_context_add_provider (gtk_widget_get_style_context (cd->panel_button),
GTK_STYLE_PROVIDER (provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION+1);
cd->custom_font_css_provider = g_object_ref (provider);
need_refresh_clock = TRUE;
}
g_free (css);
g_object_unref (provider);
}

return need_refresh_clock;
}

static void
use_custom_font_changed (GSettings *settings,
gchar *key,
ClockData *clock)
{
clock->use_custom_font = g_settings_get_boolean (settings, key);
if (update_custom_font (clock)) {
refresh_clock (clock);
}
}

static void
custom_font_changed (GSettings *settings,
gchar *key,
ClockData *clock)
{
gchar *value;

value = g_settings_get_string (settings, key);

g_free (clock->custom_font);
clock->custom_font = g_strdup (g_strstrip (value));
if (update_custom_font (clock)) {
refresh_clock (clock);
}

g_free (value);
}

static void
show_week_changed (GSettings *settings,
gchar *key,
Expand Down Expand Up @@ -2411,6 +2480,8 @@ setup_gsettings (ClockData *cd)
g_signal_connect (cd->settings, "changed::" KEY_SHOW_WEATHER, G_CALLBACK (show_weather_changed), cd);
g_signal_connect (cd->settings, "changed::" KEY_SHOW_TEMPERATURE, G_CALLBACK (show_temperature_changed), cd);
g_signal_connect (cd->settings, "changed::" KEY_CUSTOM_FORMAT, G_CALLBACK (custom_format_changed), cd);
g_signal_connect (cd->settings, "changed::" KEY_USE_CUSTOM_FONT, G_CALLBACK (use_custom_font_changed), cd);
g_signal_connect (cd->settings, "changed::" KEY_CUSTOM_FONT, G_CALLBACK (custom_font_changed), cd);
g_signal_connect (cd->settings, "changed::" KEY_SHOW_WEEK, G_CALLBACK (show_week_changed), cd);
g_signal_connect (cd->settings, "changed::" KEY_CITIES, G_CALLBACK (cities_changed), cd);
g_signal_connect (cd->settings, "changed::" KEY_TEMPERATURE_UNIT, G_CALLBACK (temperature_unit_changed), cd);
Expand Down Expand Up @@ -2458,6 +2529,8 @@ load_gsettings (ClockData *cd)
cd->show_temperature = g_settings_get_boolean (cd->settings, KEY_SHOW_TEMPERATURE);
cd->showweek = g_settings_get_boolean (cd->settings, KEY_SHOW_WEEK);
cd->timeformat = NULL;
cd->use_custom_font = g_settings_get_boolean (cd->settings, KEY_USE_CUSTOM_FONT);
cd->custom_font = g_settings_get_string (cd->settings, KEY_CUSTOM_FONT);

cd->can_handle_format_12 = (clock_locale_format () == CLOCK_FORMAT_12);
if (!cd->can_handle_format_12 && cd->format == CLOCK_FORMAT_12)
Expand Down
10 changes: 10 additions & 0 deletions applets/clock/org.mate.panel.applet.clock.gschema.xml.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@
<summary>Custom format of the clock</summary>
<description>This key specifies the format used by the clock applet when the format key is set to "custom". You can use conversion specifiers understood by strftime() to obtain a specific format. See the strftime() manual for more information.</description>
</key>
<key name="use-custom-font" type="b">
<default>false</default>
<summary>Use custom font of the clock</summary>
<description>If true, use custom font.</description>
</key>
<key name="custom-font" type="s">
<default>''</default>
<summary>Custom font of the clock</summary>
<description>Custom font of the clock. GTK3 CSS font format is preferable.</description>
</key>
<key name="show-seconds" type="b">
<default>false</default>
<summary>Show time with seconds</summary>
Expand Down

0 comments on commit bff965a

Please sign in to comment.