[gtk] popover: Always measure contents gizmo
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] popover: Always measure contents gizmo
- Date: Mon, 25 Mar 2019 14:58:45 +0000 (UTC)
commit e657d9d553819a5cf1779951685d7fd70a8c39ee
Author: Timm Bäder <mail baedert org>
Date: Sat Mar 16 06:16:43 2019 +0100
popover: Always measure contents gizmo
Otherwise we're getting warnings about allocating a widget we haven't
measured first, which is fair. The contents gizmo itself will later take
care about whether or not the real popover child is NULL.
gtk/gtkpopover.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index e118eb0e1f..a39270c5a7 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -1370,19 +1370,15 @@ gtk_popover_measure (GtkWidget *widget,
{
GtkPopover *popover = GTK_POPOVER (widget);
GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
- GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget));
int minimal_size;
*minimum = 0;
*natural = 0;
- if (child != NULL)
- {
- if (for_size >= 0)
- for_size -= TAIL_HEIGHT;
+ if (for_size >= 0)
+ for_size -= TAIL_HEIGHT;
- gtk_widget_measure (priv->contents_widget, orientation, for_size, minimum, natural, NULL, NULL);
- }
+ gtk_widget_measure (priv->contents_widget, orientation, for_size, minimum, natural, NULL, NULL);
minimal_size = get_minimal_size (popover, orientation);
*minimum = MAX (*minimum, minimal_size);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]