text-view: make measure() use the layout height

GtkTextView::measure should include the height of the text-layout in its
minimum and natural heights. This fixes scrolling when a text-view has a
scrolled-window ancestor that is not its immediate parent.
This commit is contained in:
Peter Bloomfield 2018-02-21 08:22:42 -05:00
parent 88d419456d
commit 1828c6b1cd

View File

@ -3905,7 +3905,7 @@ gtk_text_view_measure (GtkWidget *widget,
else /* orientation == VERTICAL */
{
min += priv->border_window_size.top + priv->border_window_size.bottom;
min += priv->top_margin + priv->bottom_margin;
min += priv->height;
}
nat = min;
@ -4447,6 +4447,7 @@ changed_handler (GtkTextLayout *layout,
tmp_list = tmp_list->next;
}
gtk_widget_queue_resize_no_redraw(widget);
}
}