From dad2e01481ca79468187441732ec5fe516b3c83f Mon Sep 17 00:00:00 2001 From: Adrien Plazas Date: Wed, 9 Mar 2022 10:02:53 +0100 Subject: [PATCH 1/2] d/patches: Show a ring around selected month events Fixes https://source.puri.sm/Librem5/debs/gnome-calendar/-/issues/15 --- ...e-a-selection-ring-in-the-month-view.patch | 53 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 54 insertions(+) create mode 100644 debian/patches/pureos/adaptive/0027-event-widget-Have-a-selection-ring-in-the-month-view.patch diff --git a/debian/patches/pureos/adaptive/0027-event-widget-Have-a-selection-ring-in-the-month-view.patch b/debian/patches/pureos/adaptive/0027-event-widget-Have-a-selection-ring-in-the-month-view.patch new file mode 100644 index 00000000..747fa261 --- /dev/null +++ b/debian/patches/pureos/adaptive/0027-event-widget-Have-a-selection-ring-in-the-month-view.patch @@ -0,0 +1,53 @@ +From d2e75511539bc9852d39bd4f2a6a8bd51ed9afde Mon Sep 17 00:00:00 2001 +From: Adrien Plazas +Date: Wed, 9 Mar 2022 09:51:23 +0100 +Subject: [PATCH] event-widget: Have a selection ring in the month view + +This makes it easier to be sure which event got selected on phones. + +Fixes https://source.puri.sm/Librem5/debs/gnome-calendar/-/issues/15 +--- + src/gui/gcal-event-widget.c | 4 ++++ + src/theme/Adwaita.css | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/gui/gcal-event-widget.c b/src/gui/gcal-event-widget.c +index 2ed9df60..cf5301d1 100644 +--- a/src/gui/gcal-event-widget.c ++++ b/src/gui/gcal-event-widget.c +@@ -560,6 +560,8 @@ static void + on_event_popover_closed_cb (GtkWidget *event_popover, + PreviewData *data) + { ++ gtk_widget_unset_state_flags (GTK_WIDGET (data->event_widget), GTK_STATE_FLAG_SELECTED); ++ + reply_preview_callback (event_popover, data, GCAL_EVENT_PREVIEW_ACTION_NONE); + } + +@@ -1208,6 +1210,8 @@ gcal_event_widget_show_preview (GcalEventWidget *self, + g_signal_connect (event_popover, "edit", G_CALLBACK (on_event_popover_edit_cb), data); + gtk_popover_popup (GTK_POPOVER (event_popover)); + ++ gtk_widget_set_state_flags (GTK_WIDGET (self), GTK_STATE_FLAG_SELECTED, FALSE); ++ + GCAL_EXIT; + } + +diff --git a/src/theme/Adwaita.css b/src/theme/Adwaita.css +index 200c7156..98c6bd79 100644 +--- a/src/theme/Adwaita.css ++++ b/src/theme/Adwaita.css +@@ -200,6 +200,10 @@ event { + font-size: 0.9rem; + } + ++calendar-view:not(.week-view) event:selected { ++ border: solid 2px @theme_selected_bg_color; ++} ++ + event.color-dark.horizontal.timed, + event.color-light.horizontal.timed { + margin-bottom: 0; +-- +2.30.2 + diff --git a/debian/patches/series b/debian/patches/series index f6b28144..f60f08bd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -31,3 +31,4 @@ pureos/adaptive/0023-event-popover-Make-the-summary-label-fit-phones.patch pureos/adaptive/0024-quick-add-popover-Make-the-summary-label-fit-phones.patch pureos/adaptive/0025-quick-add-popover-Make-it-more-vertical.patch pureos/adaptive/0026-week-header-Don-t-draw-the-weather-info-when-narrow.patch +pureos/adaptive/0027-event-widget-Have-a-selection-ring-in-the-month-view.patch -- GitLab From 3eab9b59666e88a7824d7e26d59178e8f16bb88a Mon Sep 17 00:00:00 2001 From: Adrien Plazas Date: Wed, 9 Mar 2022 10:04:48 +0100 Subject: [PATCH 2/2] Release to byzantium --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 55ee8966..d5f491ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnome-calendar (41.0-1pureos7) byzantium; urgency=medium + + * d/patches: Fix the week header weather overlap + * d/patches: Show a ring around selected month events + + -- Adrien Plazas Wed, 09 Mar 2022 10:03:34 +0100 + gnome-calendar (41.0-1pureos6) byzantium; urgency=medium * d/patches: Make the event popover fit phones -- GitLab