CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/02/02 08:51:53
Modified files:
. : ChangeLog
server : edit_text_character.cpp
testsuite/actionscript.all: TextField.as
Log message:
expand bounding box at every line, not just at the end
(when autoSize is true). Fixes bug #22216.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5550&r2=1.5551
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.143&r2=1.144
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/TextField.as?cvsroot=gnash&r1=1.42&r2=1.43
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5550
retrieving revision 1.5551
diff -u -b -r1.5550 -r1.5551
--- ChangeLog 2 Feb 2008 08:49:53 -0000 1.5550
+++ ChangeLog 2 Feb 2008 08:51:52 -0000 1.5551
@@ -1,5 +1,13 @@
2008-02-02 Sandro Santilli <[EMAIL PROTECTED]>
+ * testsuite/actionscript.all/TextField.as: success for the just-added
+ test.
+ * server/edit_text_character.cpp (format_text): expand bounding box
+ at every line, not just at the end (when autoSize is true).
+ Fixes bug #22216.
+
+2008-02-02 Sandro Santilli <[EMAIL PROTECTED]>
+
* testsuite/actionscript.all/TextField.as: add test for bug #22216.
2008-02-01 Sandro Santilli <[EMAIL PROTECTED]>.
Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- server/edit_text_character.cpp 21 Jan 2008 20:55:50 -0000 1.143
+++ server/edit_text_character.cpp 2 Feb 2008 08:51:52 -0000 1.144
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: edit_text_character.cpp,v 1.143 2008/01/21 20:55:50 rsavoye Exp $ */
+/* $Id: edit_text_character.cpp,v 1.144 2008/02/02 08:51:52 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "gnashconfig.h"
@@ -1198,6 +1198,9 @@
m_text_glyph_records.push_back(rec);
align_line(textAlignment, last_line_start_record, x);
+ // Expand bounding box to include last column of text
...
+ if ( _autoSize != autoSizeNone )
_bounds.expandTo(x+PADDING_TWIPS, y+PADDING_TWIPS);
+
// new paragraphs get the indent.
x = std::max(0, leftMargin + indent) + PADDING_TWIPS;
y += fontHeight + leading;
Index: testsuite/actionscript.all/TextField.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/TextField.as,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- testsuite/actionscript.all/TextField.as 2 Feb 2008 08:49:54 -0000
1.42
+++ testsuite/actionscript.all/TextField.as 2 Feb 2008 08:51:53 -0000
1.43
@@ -19,7 +19,7 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: TextField.as,v 1.42 2008/02/02 08:49:54 strk Exp $";
+rcsid="$Id: TextField.as,v 1.43 2008/02/02 08:51:53 strk Exp $";
#include "check.as"
@@ -769,7 +769,7 @@
tf.text = "single line";
linewidth = tf._width;
tf.text = "single line\n";
-xcheck_equals(tf._width, linewidth);
+check_equals(tf._width, linewidth);
#if OUTPUT_VERSION < 8
xcheck_equals(origTextWidth, tf.textWidth); // textWidth isn't influenced by
wordWrap
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
