talons

commit 15454d2fe8d7fd388da651f1d3fcc45b5095e34e
parent 70ec3f814ee4ffd16b9fb3540c9df486082a3e21
Author: paul <paul@claws-mail.org>
Date:   Fri, 15 May 2020 10:27:27 +0100

prevent segfault in day view, and layout fixes

this is a WIP

Diffstat:
M
src/plugins/vcalendar/common-views.c
 | 
4
++--
M
src/plugins/vcalendar/day-view.c
 | 
23
++++++++++++++---------
M
src/plugins/vcalendar/month-view.c
 | 
8
+++++---

3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/plugins/vcalendar/common-views.c b/src/plugins/vcalendar/common-views.c
@@ -81,9 +81,9 @@ GtkWidget *build_line(gint start_x, gint start_y
      * GdkPixbuf *scaled;
     scaled = gdk_pixbuf_scale_simple (pix, w, h, GDK_INTERP_BILINEAR);
     */
-     
+    
     pic1 = cairo_image_surface_create(CAIRO_FORMAT_A1, width, height);
-		cr = cairo_create(pic1);
+    cr = cairo_create(pic1);
 
     if (hour_line == NULL) {
         first = TRUE;
diff --git a/src/plugins/vcalendar/day-view.c b/src/plugins/vcalendar/day-view.c
@@ -398,6 +398,7 @@ static void add_row(day_win *dw, VCalEvent *event, gint days)
     ev = gtk_event_box_new();
     lab = gtk_label_new(text);
     gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
+    gtk_label_set_yalign(GTK_LABEL(lab), 0.5);
     gtk_label_set_ellipsize(GTK_LABEL(lab), PANGO_ELLIPSIZE_END);
     gtk_container_add(GTK_CONTAINER(ev), lab);
 
@@ -538,19 +539,23 @@ static void fill_days(day_win *dw, gint days, FolderItem *item, gint first_col_d
             gtk_widget_modify_bg(ev, GTK_STATE_NORMAL, &dw->bg2);
             gtk_box_pack_start(GTK_BOX(hb), ev, TRUE, TRUE, 0);
         }
+        gtk_widget_set_hexpand(hb, TRUE);
 	gtk_grid_attach(GTK_GRID(dw->dtable_h), hb, col, 1, 1, 1);
 
         /* check rows */
         for (row = 0; row < 24; row++) {
-            hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-            if (row == 0)
+            hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
+            if (row == 0) {
                 gtk_widget_set_size_request(hb, width, -1);
+		gtk_widget_set_hexpand(hb, TRUE);
+	    }
             if (dw->element[row][col]) {
                 gtk_box_pack_start(GTK_BOX(hb), dw->line[row][col]
                         , FALSE, FALSE, 0);
                 gtk_box_pack_start(GTK_BOX(hb), dw->element[row][col]
                         , TRUE, TRUE, 0);
                 gtk_widget_set_size_request(hb, width, -1);
+		gtk_widget_set_hexpand(hb, TRUE);
             }
             else {
                 ev = gtk_event_box_new();
@@ -613,11 +618,10 @@ static void build_day_view_header(day_win *dw, char *start_date)
     /* sizes */
     gtk_button_set_label(GTK_BUTTON(dw->StartDate_button)
             , (const gchar *)start_date);
-    gtk_widget_get_preferred_size(dw->StartDate_button, &dw->StartDate_button_req,
-	    			  NULL);
+    gtk_widget_get_preferred_size(dw->StartDate_button, &dw->StartDate_button_req, &dw->StartDate_button_req);
     dw->StartDate_button_req.width += dw->StartDate_button_req.width/10;
     label = gtk_label_new("00");
-    gtk_widget_get_preferred_size(label, &dw->hour_req, NULL);
+    gtk_widget_get_preferred_size(label, &dw->hour_req, &dw->hour_req);
 
     if (mainwindow_get_mainwindow()) {
         GtkAllocation allocation;
@@ -626,15 +630,14 @@ static void build_day_view_header(day_win *dw, char *start_date)
 			&allocation);
 	
 	avail_w = allocation.width - 20 - 2*(dw->hour_req.width);
-	avail_d = avail_w / dw->StartDate_button_req.width;
+	avail_d = (dw->StartDate_button_req.width > 0)? avail_w / dw->StartDate_button_req.width : avail_w;
     }
     if (avail_d >= 7) {
     	avail_d = 7;
 	gtk_widget_set_size_request(dw->StartDate_button, avail_w / avail_d, -1);
-	gtk_widget_get_preferred_size(dw->StartDate_button, &dw->StartDate_button_req,
-				      NULL);
+	gtk_widget_get_preferred_size(dw->StartDate_button, &dw->StartDate_button_req, &dw->StartDate_button_req);
     }
-   
+  
     /* initial values */
     if (avail_d)
         gtk_spin_button_set_value(GTK_SPIN_BUTTON(dw->day_spin), avail_d);
@@ -794,6 +797,8 @@ static void build_day_view_table(day_win *dw)
         g_signal_connect((gpointer)button, "clicked"
                 , G_CALLBACK(header_button_clicked_cb), dw);
         g_object_set_data(G_OBJECT(button), "offset", GINT_TO_POINTER(tm_date.tm_mday*1000));
+	gtk_widget_set_hexpand(button, TRUE);
+
 	gtk_grid_attach(GTK_GRID(dw->dtable_h), button, i, 0, 1, 1);
 
         if (++tm_date.tm_mday == (int)(monthdays[tm_date.tm_mon]+1)) {
diff --git a/src/plugins/vcalendar/month-view.c b/src/plugins/vcalendar/month-view.c
@@ -631,6 +631,8 @@ static void fill_days(month_win *mw, gint days, FolderItem *item)
 	}
         vb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
         gtk_widget_set_size_request(vb, width, height);
+	gtk_widget_set_hexpand(vb, TRUE);
+	gtk_widget_set_vexpand(vb, TRUE);
 	    if (g_date_get_day(date) == 1)
     	        label = g_strdup_printf("%d %s", g_date_get_day(date),
 				_(monthname[g_date_get_month(date)-1]));
@@ -714,11 +716,10 @@ static void build_month_view_header(month_win *mw, char *start_date)
     /* sizes */
     gtk_button_set_label(GTK_BUTTON(mw->StartDate_button)
             , (const gchar *)start_date);
-    gtk_widget_get_preferred_size(mw->StartDate_button, &mw->StartDate_button_req,
-	    			  NULL);
+    gtk_widget_get_preferred_size(mw->StartDate_button, NULL, &mw->StartDate_button_req);
     mw->StartDate_button_req.width += mw->StartDate_button_req.width/10;
     label = gtk_label_new("00");
-    gtk_widget_get_preferred_size(label, &mw->hour_req, NULL);
+    gtk_widget_get_preferred_size(label, NULL, &mw->hour_req);
 }
 
 static void build_month_view_colours(month_win *mw)
@@ -877,6 +878,7 @@ static void build_month_view_table(month_win *mw)
 
         gtk_widget_set_size_request(button, mw->StartDate_button_req.width, -1);
         g_object_set_data(G_OBJECT(button), "offset", GINT_TO_POINTER(i-1));
+	gtk_widget_set_hexpand(button, TRUE);
 	gtk_grid_attach(GTK_GRID(mw->dtable_h), button, i, 0, 1, 1);
     }