AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Make sure anchored children get size allocated, even if the layout is

Browse Source 
2004-04-20  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_allocate_children): Make
	sure anchored children get size allocated, even if the layout
	is valid.  (#122323, Andrew E. Makeev)
This commit is contained in:
Matthias Clasen 2004-04-20 13:50:19 +00:00 committed by Matthias Clasen
parent ca5188c4f2
commit 2f49fbd6cd
6 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-04-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_allocate_children): Make
sure anchored children get size allocated, even if the layout
is valid. (#122323, Andrew E. Makeev)
Mon Apr 19 17:59:17 2004 Owen Taylor <otaylor@redhat.com>
* INSTALL.in: Update libpng and libjpeg URLs, remove

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2004-04-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_allocate_children): Make
sure anchored children get size allocated, even if the layout
is valid. (#122323, Andrew E. Makeev)
Mon Apr 19 17:59:17 2004 Owen Taylor <otaylor@redhat.com>
* INSTALL.in: Update libpng and libjpeg URLs, remove

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
2004-04-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_allocate_children): Make
sure anchored children get size allocated, even if the layout
is valid. (#122323, Andrew E. Makeev)
Mon Apr 19 17:59:17 2004 Owen Taylor <otaylor@redhat.com>
* INSTALL.in: Update libpng and libjpeg URLs, remove

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2004-04-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_allocate_children): Make
sure anchored children get size allocated, even if the layout
is valid. (#122323, Andrew E. Makeev)
Mon Apr 19 17:59:17 2004 Owen Taylor <otaylor@redhat.com>
* INSTALL.in: Update libpng and libjpeg URLs, remove

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2004-04-20 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktextview.c (gtk_text_view_allocate_children): Make
sure anchored children get size allocated, even if the layout
is valid. (#122323, Andrew E. Makeev)
Mon Apr 19 17:59:17 2004 Owen Taylor <otaylor@redhat.com>
* INSTALL.in: Update libpng and libjpeg URLs, remove

20
gtk/gtktextview.c
View File

@ -43,6 +43,7 @@
#include "gtktextview.h"
#include "gtkimmulticontext.h"
#include "gdk/gdkkeysyms.h"
#include "gtkprivate.h"
#include "gtksizegroup.h" /* FIXME http://bugzilla.gnome.org/show_bug.cgi?id=72258 */
#include "gtktextutil.h"
#include "gtkwindow.h"
@ -346,7 +347,7 @@ static void gtk_text_view_remove (GtkContainer *container,
GtkWidget *child);
static void gtk_text_view_forall (GtkContainer *container,
gboolean include_internals,
GtkCallback callback,
GtkCallback callback,
gpointer callback_data);
/* FIXME probably need the focus methods. */
@ -2877,6 +2878,19 @@ gtk_text_view_allocate_children (GtkTextView *text_view)
&child_loc,
child->anchor);
/* Since anchored children are only ever allocated from
* gtk_text_layout_get_line_display() we have to make sure
* that the display line caching in the layout doesn't
* get in the way. Invalidating the layout around the anchor
* achieves this.
*/
if (GTK_WIDGET_ALLOC_NEEDED (child->widget))
{
GtkTextIter end = child_loc;
gtk_text_iter_forward_char (&end);
gtk_text_layout_invalidate (text_view->layout, &child_loc, &end);
}
gtk_text_layout_validate_yrange (text_view->layout,
&child_loc,
0, 1);
@ -4176,7 +4190,7 @@ gtk_text_view_paint (GtkWidget *widget,
while (tmp_list != NULL)
{
GtkWidget *child = tmp_list->data;
gtk_container_propagate_expose (GTK_CONTAINER (text_view),
child,
event);
@ -6108,7 +6122,7 @@ gtk_text_view_drag_data_received (GtkWidget *widget,
GtkTextIter drop_point;
GtkTextView *text_view;
gboolean success = FALSE;
GtkTextBuffer *buffer;
GtkTextBuffer *buffer = NULL;
text_view = GTK_TEXT_VIEW (widget);