diff options
| author | Timm Bäder <mail@baedert.org> | 2017-07-04 19:00:00 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-07-19 21:27:15 -0400 |
| commit | e19e3b72a3a6381e871b5e23c92e76619816d716 (patch) | |
| tree | b50239ef2715b9b1428c661233f9c6740f9f2854 | |
| parent | fb2bb87bb1362b0be032d1e56ceac8206dc612ea (diff) | |
| download | gtk+-e19e3b72a3a6381e871b5e23c92e76619816d716.tar.gz | |
widget: Always pass on baselines
| -rw-r--r-- | gtk/gtksizerequest.c | 6 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 11 |
2 files changed, 2 insertions, 15 deletions
diff --git a/gtk/gtksizerequest.c b/gtk/gtksizerequest.c index 0b1564edeb..9d991b10d1 100644 --- a/gtk/gtksizerequest.c +++ b/gtk/gtksizerequest.c @@ -299,12 +299,6 @@ gtk_widget_query_size_for_orientation (GtkWidget *widget, min_baseline = -1; nat_baseline = -1; } - else if (gtk_widget_get_valign (widget) != GTK_ALIGN_BASELINE) - { - /* Ignore requested baseline for non-aligned widgets */ - min_baseline = -1; - nat_baseline = -1; - } else if (min_baseline > reported_min_size || nat_baseline > reported_nat_size || min_baseline < 0 || diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 4cb273a23b..ea95498b4f 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3793,6 +3793,8 @@ gtk_widget_init (GTypeInstance *instance, gpointer g_class) priv->last_child = NULL; priv->prev_sibling = NULL; priv->next_sibling = NULL; + priv->allocated_baseline = -1; + priv->allocated_size_baseline = -1; priv->sensitive = TRUE; priv->redraw_on_alloc = TRUE; @@ -5366,9 +5368,6 @@ invalidate: * margins, and applying the widget’s #GtkWidget:halign and * #GtkWidget:valign properties. * - * If the child widget does not have a valign of %GTK_ALIGN_BASELINE the - * baseline argument is ignored and -1 is used instead. - * * Since: 3.10 **/ void @@ -5436,12 +5435,6 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget, } #endif /* G_ENABLE_DEBUG */ - /* Never pass a baseline to a child unless it requested it. - This means containers don't have to manually check for this. */ - if (baseline != -1 && - gtk_widget_get_valign (widget) != GTK_ALIGN_BASELINE) - baseline = -1; - alloc_needed = priv->alloc_needed; /* Preserve request/allocate ordering */ priv->alloc_needed = FALSE; |