Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

event-widget: Set the squeezer's margin via CSS

Browse Source 
This ensure the style is consistent and updates itself automatically as
the CSS classes change, and also makes the code simpler.
This commit is contained in:
Adrien Plazas
2022-06-16 08:23:45 -03:00
committed by Georges Basile Stavracas Neto
parent 4cf8b51de1
commit 0d27b08803
3 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gcal-event-widget.c
+3 -14
View File
@@ -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
src/gui/gcal-event-widget.ui
-4
View File
@@ -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 -->
src/theme/Adwaita.css
+8
View File
@@ -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;
}