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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/21 00:07:23

Modified files:
        .              : ChangeLog 
        server         : edit_text_character.cpp 

Log message:
                * server/edit_text_character.cpp (add_invalidated_bounds): use
                  instance bounds, not definition ones.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4049&r2=1.4050
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.100&r2=1.101

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4049
retrieving revision 1.4050
diff -u -b -r1.4049 -r1.4050
--- ChangeLog   20 Aug 2007 23:36:15 -0000      1.4049
+++ ChangeLog   21 Aug 2007 00:07:22 -0000      1.4050
@@ -1,5 +1,7 @@
 2007-08-21 Sandro Santilli <address@hidden>
 
+       * server/edit_text_character.cpp (add_invalidated_bounds): use
+         instance bounds, not definition ones.
        * testsuite/misc-swfc.all/Makefile.am: use an absolute
          path for MEDIADIR to make swfc happy; don't do anything
          on make check if SWFC is not enabled.

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- server/edit_text_character.cpp      18 Aug 2007 08:04:59 -0000      1.100
+++ server/edit_text_character.cpp      21 Aug 2007 00:07:22 -0000      1.101
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.100 2007/08/18 08:04:59 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.101 2007/08/21 00:07:22 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -526,12 +526,10 @@
     
        ranges.add(m_old_invalidated_ranges);
 
-       rect bounds;    
+       geometry::Range2d<float> bounds = getBounds();
+       get_world_matrix().transform(bounds);
 
-       bounds.expand_to_transformed_rect(get_world_matrix(),
-                                      m_def->get_bound());
-
-       ranges.add(bounds.getRange());            
+       ranges.add(bounds);            
 }
 
 bool
@@ -953,7 +951,7 @@
        if (extra_space <= 0.0f)
        {
                log_debug(_("TextField text doesn't fit in its boundaries: "
-                           "width %g, margin %d - nothing to align"),
+                           "width %g, margin %g - nothing to align"),
                            width, right_margin);
                return 0.0f;
        }