[Gnash-commit] gnash ChangeLog server/edit_text_character.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/26 15:52:34

Modified files:
        .              : ChangeLog 
        server         : edit_text_character.cpp 

Log message:
        don't truncate or word-wrap long lines if autoSize is on.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5261&r2=1.5262
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.139&r2=1.140

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5261
retrieving revision 1.5262
diff -u -b -r1.5261 -r1.5262
--- ChangeLog   26 Dec 2007 12:35:12 -0000      1.5261
+++ ChangeLog   26 Dec 2007 15:52:33 -0000      1.5262
@@ -1,5 +1,10 @@
 2007-12-26 Sandro Santilli <address@hidden>
 
+       * server/edit_text_character.cpp (format_text): don't truncate
+         or word-wrap long lines if autoSize is on.
+
+2007-12-26 Sandro Santilli <address@hidden>
+
        * server/: movie_instance.cpp, sprite_instance.{cpp,h}:
          Implement _lockroot
        * testsuite/actionscript.all/: MovieClip.as, MovieClipLoader.as:

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- server/edit_text_character.cpp      19 Dec 2007 18:40:07 -0000      1.139
+++ server/edit_text_character.cpp      26 Dec 2007 15:52:34 -0000      1.140
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.139 2007/12/19 18:40:07 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.140 2007/12/26 15:52:34 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1382,12 +1382,10 @@
                        //log_debug("Text in character %s exceeds margins", 
getTarget().c_str());
                        // Whoops, we just exceeded the box width. 
                        // Do word-wrap if requested to do so.
-
-                       if ( ! doWordWrap() )
-                       {
-                               //log_debug(" No word wrapping");
                                if ( autoSize == autoSizeNone )
                                {
+                               if ( ! doWordWrap() )
+                               {
                                        //log_debug(" autoSize=NONE!");
                                        // truncate long line, but keep 
expanding text box
                                        bool newlinefound = false;
@@ -1419,8 +1417,7 @@
                                        }
                                        if ( ! newlinefound ) break;
                                }
-                       }
-                       else // do word wrap
+                               else 
                        {
 
                                // Insert newline.
@@ -1478,6 +1475,7 @@
                                last_line_start_record = 
m_text_glyph_records.size();
                        }
                }
+               }
 
                if (m_cursor > character_idx)
                {