[gnome-applets/window-picker-cleanup: 2/2] windowpicker: set task item size request on construction

[Sebastian Geiger <segeiger src gnome org>]

commit 5682e22a0ed6a1b1d34becd62183d430793c454b
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sat Mar 21 23:09:11 2020 +0100

    windowpicker: set task item size request on construction
    
    Calling gtk_widget_set_size_request in the size-allocate callback
    is not correct according to GTK developers. Moving this
    to the constructor is a better solution and also avoids
    repeated size-request calls in the allocate-size callback.

 windowpicker/src/task-item.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/windowpicker/src/task-item.c b/windowpicker/src/task-item.c
index 514e19890..ab3e0edc5 100644
--- a/windowpicker/src/task-item.c
+++ b/windowpicker/src/task-item.c
@@ -375,18 +375,18 @@ static gboolean task_item_draw (
     return FALSE;
 }
 
-static void on_size_allocate (
-    GtkWidget     *widget,
-    GtkAllocation *allocation,
-    TaskItem      *item)
+static void
+on_size_allocate (GtkWidget     *widget,
+                  GtkAllocation *allocation,
+                  TaskItem      *item)
 {
     g_return_if_fail (TASK_IS_ITEM (item));
-    if (allocation->width != allocation->height + 6)
-        gtk_widget_set_size_request (widget, allocation->height + 6, -1);
+
     item->area.x = allocation->x;
     item->area.y = allocation->y;
     item->area.width = allocation->width;
     item->area.height = allocation->height;
+
     update_hints (item);
 }
 
@@ -948,10 +948,14 @@ static void task_item_init (TaskItem *item) {
     item->blink_timer = 0;
 }
 
-GtkWidget *task_item_new (WpApplet* windowPickerApplet, WnckWindow *window) {
+GtkWidget *
+task_item_new (WpApplet* windowPickerApplet,
+               WnckWindow *window)
+{
     TaskItem *taskItem;
     WnckScreen *screen;
     GtkWidget *item;
+    GtkAllocation allocation;
 
     g_return_val_if_fail (WNCK_IS_WINDOW (window), NULL);
 
@@ -963,6 +967,10 @@ GtkWidget *task_item_new (WpApplet* windowPickerApplet, WnckWindow *window) {
         NULL
     );
     gtk_widget_set_vexpand(item, TRUE);
+
+    gtk_widget_get_allocation (GTK_WIDGET (windowPickerApplet), &allocation);
+    gtk_widget_set_size_request (item, allocation.height + 6, -1);
+
     gtk_widget_add_events (item, GDK_ALL_EVENTS_MASK);
     gtk_container_set_border_width (GTK_CONTAINER (item), 0);
     taskItem = TASK_ITEM (item);