From 0d27b08803986c3d63ebaf07e1bfa2c6382b9254 Mon Sep 17 00:00:00 2001
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Tue, 10 May 2022 11:18:36 +0200
Subject: [PATCH] event-widget: Set the squeezer's margin via CSS

This ensure the style is consistent and updates itself automatically as
the CSS classes change, and also makes the code simpler.
---
 src/gui/gcal-event-widget.c  | 17 +++--------------
 src/gui/gcal-event-widget.ui |  4 ----
 src/theme/Adwaita.css        |  8 ++++++++
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/gui/gcal-event-widget.c b/src/gui/gcal-event-widget.c
index b713cad1..3961480a 100644
--- a/src/gui/gcal-event-widget.c
+++ b/src/gui/gcal-event-widget.c
@@ -129,6 +129,7 @@ gcal_event_widget_update_style (GcalEventWidget *self)
   gtk_widget_remove_css_class (GTK_WIDGET (self), "slanted");
   gtk_widget_remove_css_class (GTK_WIDGET (self), "slanted-start");
   gtk_widget_remove_css_class (GTK_WIDGET (self), "slanted-end");
+  gtk_widget_remove_css_class (GTK_WIDGET (self), "timed");
 
   /*
    * If the event's dates differs from the widget's dates,
@@ -166,22 +167,10 @@ gcal_event_widget_update_style (GcalEventWidget *self)
    */
   timed = !gcal_event_get_all_day (self->event) && !gcal_event_is_multiday (self->event);
 
-  gtk_widget_set_visible (self->color_box, timed);
+  gtk_widget_set_visible (self->color_box, timed && self->orientation == GTK_ORIENTATION_HORIZONTAL);
 
   if (timed)
-    {
-      gtk_widget_add_css_class (GTK_WIDGET (self), "timed");
-
-      if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
-        {
-          gtk_widget_set_margin_start (self->squeezer, 0);
-          gtk_widget_set_margin_end (self->squeezer, 2);
-        }
-      else
-        {
-          gtk_widget_set_visible (self->color_box, FALSE);
-        }
-    }
+    gtk_widget_add_css_class (GTK_WIDGET (self), "timed");
 }
 
 static void
diff --git a/src/gui/gcal-event-widget.ui b/src/gui/gcal-event-widget.ui
index 111741d2..2af888b2 100644
--- a/src/gui/gcal-event-widget.ui
+++ b/src/gui/gcal-event-widget.ui
@@ -30,10 +30,6 @@
           <object class="AdwSqueezer" id="squeezer">
             <property name="hexpand">False</property>
             <property name="homogeneous">False</property>
-            <property name="margin-top">1</property>
-            <property name="margin-bottom">1</property>
-            <property name="margin-start">6</property>
-            <property name="margin-end">4</property>
             <property name="orientation">vertical</property>
 
             <!-- Vertical page -->
diff --git a/src/theme/Adwaita.css b/src/theme/Adwaita.css
index 7ea1eb3e..d09f525c 100644
--- a/src/theme/Adwaita.css
+++ b/src/theme/Adwaita.css
@@ -74,6 +74,14 @@ event {
     font-size: 0.9rem;
 }
 
+event squeezer {
+  margin: 1px 4px 1px 6px;
+}
+
+event.horizontal.timed squeezer {
+  margin: 1px 2px 1px 0px;
+}
+
 event.vertical.timed {
   padding: 3px 6px;
 }