[gtk: 1/2] text-view: make measure() use the layout height
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 1/2] text-view: make measure() use the layout height
- Date: Fri, 23 Feb 2018 16:04:53 +0000 (UTC)
commit 1828c6b1cd3b5a3394e2189a1a06fa19e30eab12
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Wed Feb 21 08:22:42 2018 -0500
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.
gtk/gtktextview.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 85f2207d38..8abb165e97 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -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);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]