search for: swfdec_text_field_movie_render

...gt;str[start_index + length - 1] == '\n' || + text->input->str[start_index + length - 1] == '\r') { + paragraph->newline = TRUE; + } else { + paragraph->newline = FALSE; + } paragraph->blocks = NULL; paragraph->attrs = NULL; @@ -748,7 +753,8 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr, first = TRUE; linenum = 0; - x = movie->original_extents.x0 + EXTRA_MARGIN + text_movie->hscroll; + x = movie->original_extents.x0 + EXTRA_MARGIN + + MIN (text_movie->hscroll, text_movie->hscroll_max); y = movie->original_extents.y...

...54 2007 +0300 More TextField's scroll properties compatibility fixes diff --git a/libswfdec/swfdec_text_field_movie.c b/libswfdec/swfdec_text_field_movie.c index 4a91792..5cfc7dd 100644 --- a/libswfdec/swfdec_text_field_movie.c +++ b/libswfdec/swfdec_text_field_movie.c @@ -679,7 +679,8 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr, } void -swfdec_text_field_movie_update_scroll (SwfdecTextFieldMovie *text) +swfdec_text_field_movie_update_scroll (SwfdecTextFieldMovie *text, + gboolean check_limits) { SwfdecLayout *layouts; int i, num, y, visible, all, height; @@ -729,11 +730,16 @@...

...07 +0200 Fix a memory leak in TextField code (PangoLayoutIter not freed) diff --git a/libswfdec/swfdec_text_field_movie.c b/libswfdec/swfdec_text_field_movie.c index b130da2..36b3596 100644 --- a/libswfdec/swfdec_text_field_movie.c +++ b/libswfdec/swfdec_text_field_movie.c @@ -789,6 +789,8 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr, y += layout->height - skipped; skipped = 0; } + + pango_layout_iter_free (iter_line); } swfdec_text_field_movie_free_layouts (layouts); commit 5f3abe827c99cca6b067b90c0ee88eddfb8c9242 Author: Pekka Lampila <pekka.lampila at iki.f...

libswfdec/swfdec_text_field_movie.c | 2 ++ 1 file changed, 2 insertions(+) New commits: commit 27e0f570ff653063b78efc89a604236e7fe03ece Author: Pekka Lampila <pekka.lampila at iki.fi> Date: Sat Oct 27 17:14:06 2007 +0300 Init TextField's native properties when TextField is created from a tag diff --git a/libswfdec/swfdec_text_field_movie.c

...39;t use alpha from transforms for TextField's border or background color diff --git a/libswfdec/swfdec_text_field_movie.c b/libswfdec/swfdec_text_field_movie.c index 2780b7e..979580e 100644 --- a/libswfdec/swfdec_text_field_movie.c +++ b/libswfdec/swfdec_text_field_movie.c @@ -593,7 +593,8 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr, if (text->background) { cairo_rectangle (cr, limit.x0, limit.y0, limit.x1 - limit.x0, limit.y1 - limit.y0); color = swfdec_color_apply_transform (text_movie->background_color, trans); - swfdec_color_set_source (cr, color); + // always use f...

...t cairo context position after pango calls, just use cairo_move_to always diff --git a/libswfdec/swfdec_text_field_movie.c b/libswfdec/swfdec_text_field_movie.c index 1f88654..db37d98 100644 --- a/libswfdec/swfdec_text_field_movie.c +++ b/libswfdec/swfdec_text_field_movie.c @@ -807,8 +807,6 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr, cairo_fill (cr); } - cairo_move_to (cr, x, y); - skipped = 0; do { if (++linenum < MIN (text_movie->scroll, text_movie->scroll_max)) @@ -833,21 +831,18 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr,...

...object_class->mark = swfdec_text_field_movie_mark; movie_class->init_movie = swfdec_text_field_movie_init_movie; + movie_class->finish_movie = swfdec_text_field_movie_finish_movie; movie_class->update_extents = swfdec_text_field_movie_update_extents; movie_class->render = swfdec_text_field_movie_render; } @@ -722,14 +730,40 @@ static void swfdec_text_field_movie_parse_listen_variable (SwfdecTextFieldMovie *text, const char *variable, SwfdecAsObject **object, const char **name) { + SwfdecAsContext *cx; + SwfdecAsObject *parent; + const char *p1, *p2; + g_return_if_fail (SWFDEC_IS_TEX...

...37 2007 +0200 Some fixes to background and border drawing in TextField diff --git a/libswfdec/swfdec_text_field_movie.c b/libswfdec/swfdec_text_field_movie.c index 5d499b2..2780b7e 100644 --- a/libswfdec/swfdec_text_field_movie.c +++ b/libswfdec/swfdec_text_field_movie.c @@ -591,19 +591,23 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr, cairo_clip (cr); if (text->background) { - cairo_rectangle (cr, limit.x0, limit.y0, limit.x1, limit.y1); + cairo_rectangle (cr, limit.x0, limit.y0, limit.x1 - limit.x0, limit.y1 - limit.y0); color = swfdec_color_apply_transform (text_movie-&gt...

...i> Date: Mon Oct 22 22:50:11 2007 +0300 Border line width is 1 twip diff --git a/libswfdec/swfdec_text_field_movie.c b/libswfdec/swfdec_text_field_movie.c index c071666..b56466d 100644 --- a/libswfdec/swfdec_text_field_movie.c +++ b/libswfdec/swfdec_text_field_movie.c @@ -611,7 +611,7 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr, movie->original_extents.y1); color = swfdec_color_apply_transform (text_movie->border_color, trans); swfdec_color_set_source (cr, color); - cairo_set_line_width (cr, 20.0); // FIXME: Is this correct? + cairo_set_line_width (cr, SWFDEC_DOUBLE...

...+ layout.height += block->leading / PANGO_SCALE; + + layouts = g_array_append_val (layouts, layout); + + if (!text->word_wrap) + break; + } + } + + if (num != NULL) + *num = layouts->len; + + return (SwfdecLayout *)g_array_free (layouts, FALSE); +} + + static void swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr, const SwfdecColorTransform *trans, const SwfdecRect *inval) { - SwfdecTextFieldMovie *text = SWFDEC_TEXT_FIELD_MOVIE (movie); + SwfdecTextFieldMovie *text_movie; + SwfdecTextField *text; + SwfdecLayout *layouts; + SwfdecRect limit; + SwfdecColor color;...

...styles if (block->index_ == 0) { pango_layout_set_indent (playout, paragraphs[i].indent); - // TODO: bullet + layout.bullet = paragraphs[i].bullet; } else { pango_layout_set_indent (playout, 0); + layout.bullet = FALSE; } // set block styles @@ -748,7 +750,6 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr, linenum = 0; x = movie->original_extents.x0 + EXTRA_MARGIN + text_movie->hscroll; y = movie->original_extents.y0 + EXTRA_MARGIN; - cairo_move_to (cr, x, y); for (i = 0; layouts[i].layout != NULL && y < limit.y1; i++) { @@ -760,...

...D_EXTENTS); return TRUE; } @@ -1204,6 +1214,7 @@ swfdec_text_field_movie_class_init (SwfdecTextFieldMovieClass * g_class) movie_class->iterate_start = swfdec_text_field_movie_iterate; movie_class->update_extents = swfdec_text_field_movie_update_extents; movie_class->render = swfdec_text_field_movie_render; + movie_class->invalidate = swfdec_text_field_movie_invalidate; } static void @@ -1536,7 +1547,7 @@ swfdec_text_field_movie_replace_text (SwfdecTextFieldMovie *text, end_index - start_index); text->input = g_string_insert (text->input, start_index, str); - swfdec_movie_i...

...text->text->html); } } @@ -672,7 +633,6 @@ swfdec_text_field_movie_class_init (SwfdecTextFieldMovieClass * g_class) movie_class->init_movie = swfdec_text_field_movie_init_movie; movie_class->update_extents = swfdec_text_field_movie_update_extents; movie_class->render = swfdec_text_field_movie_render; - movie_class->iterate_start = swfdec_text_field_movie_iterate; } static void @@ -760,14 +720,330 @@ swfdec_text_field_movie_set_text_format (SwfdecTextFieldMovie *text, swfdec_text_field_movie_format_changed (text); } +static void +swfdec_text_field_movie_set_variable_text (SwfdecTe...

...ss->init_movie = swfdec_text_field_movie_init_movie; movie_class->finish_movie = swfdec_text_field_movie_finish_movie; + movie_class->iterate_start = swfdec_text_field_movie_iterate; movie_class->update_extents = swfdec_text_field_movie_update_extents; movie_class->render = swfdec_text_field_movie_render; } diff --git a/libswfdec/swfdec_text_field_movie.h b/libswfdec/swfdec_text_field_movie.h index 058d915..70ddb4f 100644 --- a/libswfdec/swfdec_text_field_movie.h +++ b/libswfdec/swfdec_text_field_movie.h @@ -92,6 +92,7 @@ struct _SwfdecTextFieldMovie { gboolean embed_fonts; SwfdecStyleSheet...

...movie.c +++ b/libswfdec/swfdec_text_field_movie.c @@ -37,6 +37,8 @@ G_DEFINE_TYPE (SwfdecTextFieldMovie, swfdec_text_field_movie, SWFDEC_TYPE_MOVIE) +#define EXTRA_MARGIN 2 + static void swfdec_text_field_movie_update_extents (SwfdecMovie *movie, SwfdecRect *extents) @@ -611,8 +613,8 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr, first = TRUE; linenum = 0; - x = movie->original_extents.x0 + text_movie->hscroll; - y = movie->original_extents.y0 + 1; + x = movie->original_extents.x0 + EXTRA_MARGIN + text_movie->hscroll; + y = movie->original_extents.y0 + EXTRA_MA...

...e Nov 20 10:21:47 2007 +0100 don't render text fields when clipping diff --git a/libswfdec/swfdec_text_field_movie.c b/libswfdec/swfdec_text_field_movie.c index 5639d1f..1f88654 100644 --- a/libswfdec/swfdec_text_field_movie.c +++ b/libswfdec/swfdec_text_field_movie.c @@ -717,6 +717,10 @@ swfdec_text_field_movie_render (SwfdecMovie *movie, cairo_t *cr, g_return_if_fail (trans != NULL); g_return_if_fail (inval != NULL); + /* textfields don't mask */ + if (swfdec_color_transform_is_mask (trans)) + return; + text_movie = SWFDEC_TEXT_FIELD_MOVIE (movie); text = SWFDEC_TEXT_FIELD (movie->grap...