[gnome-calendar] Use gtk_widget_add/remove_css_class() where possible
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar] Use gtk_widget_add/remove_css_class() where possible
- Date: Tue, 10 May 2022 12:54:19 +0000 (UTC)
commit aecfebcc9dbb6eb5f81af69a18332a809498e7b5
Author: Adrien Plazas <kekun plazas laposte net>
Date: Tue May 10 13:01:25 2022 +0200
Use gtk_widget_add/remove_css_class() where possible
This makes the code simpler and more idiomatic to GTK 4.
src/gui/calendar-management/gcal-new-calendar-page.c | 7 ++-----
src/gui/event-editor/gcal-date-chooser-day.c | 2 +-
src/gui/event-editor/gcal-date-chooser.c | 4 ++--
src/gui/gcal-calendar-button.c | 2 +-
src/gui/gcal-event-widget.c | 2 +-
src/gui/gcal-quick-add-popover.c | 2 +-
src/gui/gcal-window.c | 7 +------
src/gui/importer/gcal-import-file-row.c | 2 +-
src/gui/views/gcal-month-cell.c | 8 ++------
9 files changed, 12 insertions(+), 24 deletions(-)
---
diff --git a/src/gui/calendar-management/gcal-new-calendar-page.c
b/src/gui/calendar-management/gcal-new-calendar-page.c
index e701df82..7a9be767 100644
--- a/src/gui/calendar-management/gcal-new-calendar-page.c
+++ b/src/gui/calendar-management/gcal-new-calendar-page.c
@@ -200,15 +200,12 @@ static void
update_url_entry_state (GcalNewCalendarPage *self,
EntryState state)
{
- GtkStyleContext *context;
-
self->calendar_address_entry_state = state;
- context = gtk_widget_get_style_context (GTK_WIDGET (self->calendar_address_entry));
if (state == ENTRY_STATE_INVALID)
- gtk_style_context_add_class (context, "error");
+ gtk_widget_add_css_class (GTK_WIDGET (self->calendar_address_entry), "error");
else
- gtk_style_context_remove_class (context, "error");
+ gtk_widget_remove_css_class (GTK_WIDGET (self->calendar_address_entry), "error");
update_add_button (self);
toggle_url_entry_pulsing (self, state == ENTRY_STATE_VALIDATING);
diff --git a/src/gui/event-editor/gcal-date-chooser-day.c b/src/gui/event-editor/gcal-date-chooser-day.c
index fbffc8ca..cc244520 100644
--- a/src/gui/event-editor/gcal-date-chooser-day.c
+++ b/src/gui/event-editor/gcal-date-chooser-day.c
@@ -99,7 +99,7 @@ gcal_date_chooser_day_init (GcalDateChooserDay *self)
gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
gtk_widget_set_can_focus (widget, TRUE);
- gtk_style_context_add_class (gtk_widget_get_style_context (widget), "day");
+ gtk_widget_add_css_class (widget, "day");
self->label = gtk_label_new ("");
gtk_widget_set_halign (self->label, GTK_ALIGN_CENTER);
diff --git a/src/gui/event-editor/gcal-date-chooser.c b/src/gui/event-editor/gcal-date-chooser.c
index af65bcb4..6072953b 100644
--- a/src/gui/event-editor/gcal-date-chooser.c
+++ b/src/gui/event-editor/gcal-date-chooser.c
@@ -562,7 +562,7 @@ gcal_date_chooser_init (GcalDateChooser *self)
"visible",
G_BINDING_SYNC_CREATE);
- gtk_style_context_add_class (gtk_widget_get_style_context (self->cols[col]), "weekday");
+ gtk_widget_add_css_class (self->cols[col], "weekday");
gtk_grid_attach (GTK_GRID (self->grid), self->cols[col], col, -1, 1, 1);
}
@@ -577,7 +577,7 @@ gcal_date_chooser_init (GcalDateChooser *self)
"visible",
G_BINDING_SYNC_CREATE);
- gtk_style_context_add_class (gtk_widget_get_style_context (self->rows[row]), "weeknum");
+ gtk_widget_add_css_class (self->rows[row], "weeknum");
gtk_grid_attach (GTK_GRID (self->grid), self->rows[row], -1, row, 1, 1);
}
diff --git a/src/gui/gcal-calendar-button.c b/src/gui/gcal-calendar-button.c
index ceb6d745..eae6bc40 100644
--- a/src/gui/gcal-calendar-button.c
+++ b/src/gui/gcal-calendar-button.c
@@ -79,7 +79,7 @@ make_calendar_row (GcalCalendar *calendar)
paintable = get_circle_paintable_from_color (color, 16);
icon = gtk_image_new_from_paintable (paintable);
- gtk_style_context_add_class (gtk_widget_get_style_context (icon), "calendar-color-image");
+ gtk_widget_add_css_class (icon, "calendar-color-image");
/* source name label */
label = gtk_label_new (gcal_calendar_get_name (calendar));
diff --git a/src/gui/gcal-event-widget.c b/src/gui/gcal-event-widget.c
index cf8722ed..3d125e18 100644
--- a/src/gui/gcal-event-widget.c
+++ b/src/gui/gcal-event-widget.c
@@ -865,7 +865,7 @@ gcal_event_widget_init (GcalEventWidget *self)
/* Starts with horizontal */
self->orientation = GTK_ORIENTATION_HORIZONTAL;
- gtk_style_context_add_class (gtk_widget_get_style_context (widget), "horizontal");
+ gtk_widget_add_css_class (widget, "horizontal");
}
GtkWidget*
diff --git a/src/gui/gcal-quick-add-popover.c b/src/gui/gcal-quick-add-popover.c
index 42ae69c2..0db1301e 100644
--- a/src/gui/gcal-quick-add-popover.c
+++ b/src/gui/gcal-quick-add-popover.c
@@ -90,7 +90,7 @@ create_calendar_row (GcalManager *manager,
gtk_box_append (GTK_BOX (box), icon);
- gtk_style_context_add_class (gtk_widget_get_style_context (icon), "calendar-color-image");
+ gtk_widget_add_css_class (icon, "calendar-color-image");
/* Source name label */
label = gtk_label_new (gcal_calendar_get_name (calendar));
diff --git a/src/gui/gcal-window.c b/src/gui/gcal-window.c
index 1fbf47d1..cd2f10de 100644
--- a/src/gui/gcal-window.c
+++ b/src/gui/gcal-window.c
@@ -1076,12 +1076,7 @@ gcal_window_init (GcalWindow *self)
/* devel styling */
if (g_strcmp0 (PROFILE, "Devel") == 0)
- {
- GtkStyleContext *style_context;
-
- style_context = gtk_widget_get_style_context (GTK_WIDGET (self));
- gtk_style_context_add_class (style_context, "devel");
- }
+ gtk_widget_add_css_class (GTK_WIDGET (self), "devel");
gtk_widget_set_parent (self->quick_add_popover, GTK_WIDGET (self));
}
diff --git a/src/gui/importer/gcal-import-file-row.c b/src/gui/importer/gcal-import-file-row.c
index 5a16eeb4..cc7cf5af 100644
--- a/src/gui/importer/gcal-import-file-row.c
+++ b/src/gui/importer/gcal-import-file-row.c
@@ -88,7 +88,7 @@ add_grid_row (GcalImportFileRow *self,
"ellipsize", PANGO_ELLIPSIZE_END,
"max-width-chars", 40,
NULL);
- gtk_style_context_add_class (gtk_widget_get_style_context (title_label), "dim-label");
+ gtk_widget_add_css_class (title_label, "dim-label");
gtk_grid_attach (grid, title_label, 0, row, 1, 1);
gtk_size_group_add_widget (self->title_sizegroup, title_label);
diff --git a/src/gui/views/gcal-month-cell.c b/src/gui/views/gcal-month-cell.c
index 1e38fa5e..c0abdef5 100644
--- a/src/gui/views/gcal-month-cell.c
+++ b/src/gui/views/gcal-month-cell.c
@@ -425,8 +425,6 @@ void
gcal_month_cell_set_different_month (GcalMonthCell *self,
gboolean different)
{
- GtkStyleContext *context;
-
g_return_if_fail (GCAL_IS_MONTH_CELL (self));
if (self->different_month == different)
@@ -434,12 +432,10 @@ gcal_month_cell_set_different_month (GcalMonthCell *self,
self->different_month = different;
- context = gtk_widget_get_style_context (GTK_WIDGET (self));
-
if (different)
- gtk_style_context_add_class (context, "out-of-month");
+ gtk_widget_add_css_class (GTK_WIDGET (self), "out-of-month");
else
- gtk_style_context_remove_class (context, "out-of-month");
+ gtk_widget_remove_css_class (GTK_WIDGET (self), "out-of-month");
}
GcalContext*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]