* clutter/clutter-entry.c (clutter_entry_paint): Set the clip

using COGL directly instead of setting the actor clip. Otherwise
	the clip stack will be unbalanced after the first draw. This also
	frees up the actor clip to be set by an application.
This commit is contained in:
Neil Roberts 2008-06-23 20:55:24 +00:00
parent f6b7783440
commit e11d08807d
2 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2008-06-23 Neil Roberts <neil@o-hand.com>
* clutter/clutter-entry.c (clutter_entry_paint): Set the clip
using COGL directly instead of setting the actor clip. Otherwise
the clip stack will be unbalanced after the first draw. This also
frees up the actor clip to be set by an application.
2008-06-23 Matthew Allum <mallum@openedhand.com>
* NEWS:

View File

@ -422,9 +422,8 @@ clutter_entry_paint (ClutterActor *self)
else
width = priv->width;
clutter_actor_set_clip (self, 0, 0,
width,
clutter_actor_get_height (self));
cogl_clip_set (0, 0, CLUTTER_INT_TO_FIXED (width),
CLUTTER_INT_TO_FIXED (clutter_actor_get_height (self)));
actor_width = width - (2 * priv->entry_padding);
clutter_entry_ensure_layout (entry, actor_width);
@ -482,6 +481,8 @@ clutter_entry_paint (ClutterActor *self)
if (CLUTTER_ENTRY_GET_CLASS (entry)->paint_cursor)
CLUTTER_ENTRY_GET_CLASS (entry)->paint_cursor (entry);
cogl_clip_unset ();
}
static void