Commit 2cf4b8ad authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

handle case where text_view->layout == NULL by assuming its size is 0,

2001-06-04  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_size_request): handle case
	where text_view->layout == NULL by assuming its size is 0,
	i.e. same as if we haven't done any reflow. Reported by
	Hidetoshi Tajima #55448
parent 5d1c5446
2001-06-04 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_size_request): handle case
where text_view->layout == NULL by assuming its size is 0,
i.e. same as if we haven't done any reflow. Reported by
Hidetoshi Tajima #55448
2001-06-04 Havoc Pennington <hp@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6
......
2001-06-04 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_size_request): handle case
where text_view->layout == NULL by assuming its size is 0,
i.e. same as if we haven't done any reflow. Reported by
Hidetoshi Tajima #55448
2001-06-04 Havoc Pennington <hp@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6
......
2001-06-04 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_size_request): handle case
where text_view->layout == NULL by assuming its size is 0,
i.e. same as if we haven't done any reflow. Reported by
Hidetoshi Tajima #55448
2001-06-04 Havoc Pennington <hp@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6
......
2001-06-04 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_size_request): handle case
where text_view->layout == NULL by assuming its size is 0,
i.e. same as if we haven't done any reflow. Reported by
Hidetoshi Tajima #55448
2001-06-04 Havoc Pennington <hp@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6
......
2001-06-04 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_size_request): handle case
where text_view->layout == NULL by assuming its size is 0,
i.e. same as if we haven't done any reflow. Reported by
Hidetoshi Tajima #55448
2001-06-04 Havoc Pennington <hp@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6
......
2001-06-04 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_size_request): handle case
where text_view->layout == NULL by assuming its size is 0,
i.e. same as if we haven't done any reflow. Reported by
Hidetoshi Tajima #55448
2001-06-04 Havoc Pennington <hp@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6
......
2001-06-04 Havoc Pennington <hp@redhat.com>
* gtk/gtktextview.c (gtk_text_view_size_request): handle case
where text_view->layout == NULL by assuming its size is 0,
i.e. same as if we haven't done any reflow. Reported by
Hidetoshi Tajima #55448
2001-06-04 Havoc Pennington <hp@redhat.com>
* gdk/x11/gdkevents-x11.c (gdk_event_translate): support button 6
......
......@@ -2286,9 +2286,17 @@ gtk_text_view_size_request (GtkWidget *widget,
focus_edge_width = 0;
else
focus_edge_width = 1;
text_view->text_window->requisition.width = text_view->layout->width;
text_view->text_window->requisition.height = text_view->layout->height;
if (text_view->layout)
{
text_view->text_window->requisition.width = text_view->layout->width;
text_view->text_window->requisition.height = text_view->layout->height;
}
else
{
text_view->text_window->requisition.width = 0;
text_view->text_window->requisition.height = 0;
}
requisition->width = text_view->text_window->requisition.width + focus_edge_width * 2;
requisition->height = text_view->text_window->requisition.height + focus_edge_width * 2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment