[libgd/wip/ernestask/gtk4: 1/33] Use new gtk_widget_size_allocate() signature
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgd/wip/ernestask/gtk4: 1/33] Use new gtk_widget_size_allocate() signature
- Date: Sun, 11 Mar 2018 08:17:31 +0000 (UTC)
commit 1e414c5b7ee73b7fd20ae835c4acaceffc4b6128
Author: Ernestas Kulik <ernestask gnome org>
Date: Mon Mar 5 17:47:20 2018 +0200
Use new gtk_widget_size_allocate() signature
libgd/gd-main-icon-box-icon.c | 7 +++++--
libgd/gd-margin-container.c | 6 ++++--
libgd/gd-notification.c | 16 ++++++++++------
3 files changed, 19 insertions(+), 10 deletions(-)
---
diff --git a/libgd/gd-main-icon-box-icon.c b/libgd/gd-main-icon-box-icon.c
index e05efba..63695eb 100644
--- a/libgd/gd-main-icon-box-icon.c
+++ b/libgd/gd-main-icon-box-icon.c
@@ -159,7 +159,10 @@ gd_main_icon_box_icon_get_preferred_width (GtkWidget *widget, gint *minimum, gin
}
static void
-gd_main_icon_box_icon_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
+gd_main_icon_box_icon_size_allocate (GtkWidget *widget,
+ const GtkAllocation *allocation,
+ gint baseline,
+ GtkAllocation *out_clip)
{
GdMainIconBoxIcon *self = GD_MAIN_ICON_BOX_ICON (widget);
cairo_surface_t *surface;
@@ -173,7 +176,7 @@ gd_main_icon_box_icon_size_allocate (GtkWidget *widget, GtkAllocation *allocatio
gint width_scaled;
gint width_zoomed_scaled;
- GTK_WIDGET_CLASS (gd_main_icon_box_icon_parent_class)->size_allocate (widget, allocation);
+ GTK_WIDGET_CLASS (gd_main_icon_box_icon_parent_class)->size_allocate (widget, allocation, baseline,
out_clip);
surface = gd_main_box_item_get_icon (self->item);
if (surface == NULL)
diff --git a/libgd/gd-margin-container.c b/libgd/gd-margin-container.c
index fd49203..1d4243b 100644
--- a/libgd/gd-margin-container.c
+++ b/libgd/gd-margin-container.c
@@ -142,8 +142,10 @@ gd_margin_container_get_property (GObject *object,
}
static void
-gd_margin_container_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
+gd_margin_container_size_allocate (GtkWidget *widget,
+ const GtkAllocation *allocation,
+ gint baseline,
+ GtkAllocation *out_clip)
{
GdMarginContainer *self = GD_MARGIN_CONTAINER (widget);
GtkWidget *child;
diff --git a/libgd/gd-notification.c b/libgd/gd-notification.c
index e7d058b..8f9bd60 100644
--- a/libgd/gd-notification.c
+++ b/libgd/gd-notification.c
@@ -90,8 +90,10 @@ static void gd_notification_get_preferred_width_for_height (GtkWidget
gint height,
gint *minimum_width,
gint *natural_width);
-static void gd_notification_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
+static void gd_notification_size_allocate (GtkWidget *widget,
+ const GtkAllocation *allocation,
+ gint baseline,
+ GtkAllocation *out_clip);
static gboolean gd_notification_timeout_cb (gpointer user_data);
static void gd_notification_show (GtkWidget *widget);
static void gd_notification_add (GtkContainer *container,
@@ -752,8 +754,10 @@ gd_notification_get_preferred_height (GtkWidget *widget,
}
static void
-gd_notification_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
+gd_notification_size_allocate (GtkWidget *widget,
+ const GtkAllocation *allocation,
+ gint baseline,
+ GtkAllocation *out_clip)
{
GdNotification *notification = GD_NOTIFICATION (widget);
GdNotificationPrivate *priv = notification->priv;
@@ -801,7 +805,7 @@ gd_notification_size_allocate (GtkWidget *widget,
child = gtk_bin_get_child (bin);
if (child && gtk_widget_get_visible (child))
- gtk_widget_size_allocate (child, &child_allocation);
+ gtk_widget_size_allocate (child, &child_allocation, baseline, out_clip);
if (priv->show_close_button)
{
@@ -810,7 +814,7 @@ gd_notification_size_allocate (GtkWidget *widget,
child_allocation.y += (child_allocation.height - button_req.height) / 2;
child_allocation.height = button_req.height;
- gtk_widget_size_allocate (priv->close_button, &child_allocation);
+ gtk_widget_size_allocate (priv->close_button, &child_allocation, baseline, out_clip);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]