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

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/06/07 09:20:44

Modified files:
        .              : ChangeLog 
        server         : edit_text_character.cpp 

Log message:
        server/edit_text_character.cpp: shift text by 2 pixels, fixes bug #17954

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3477&r2=1.3478
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.62&r2=1.63

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.3477
retrieving revision 1.3478
diff -u -b -r1.3477 -r1.3478
--- ChangeLog   7 Jun 2007 07:28:23 -0000       1.3477
+++ ChangeLog   7 Jun 2007 09:20:44 -0000       1.3478
@@ -1,3 +1,8 @@
+2007-06-07 Udo Giacomozzi <address@hidden>
+
+       * server/edit_text_character.cpp: shift text by 2 pixels, 
+         fixes bug #17954
+
 2007-06-07 Zou Lunkai <address@hidden>
 
        * server/sprite_instance.cpp: improved call_frame_actions(), 

Index: server/edit_text_character.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- server/edit_text_character.cpp      26 Apr 2007 10:56:50 -0000      1.62
+++ server/edit_text_character.cpp      7 Jun 2007 09:20:44 -0000       1.63
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.62 2007/04/26 10:56:50 zoulunkai Exp $ */
+/* $Id: edit_text_character.cpp,v 1.63 2007/06/07 09:20:44 udog Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -451,10 +451,19 @@
        // m_x_offset and m_y_offset memebers in glyph records.
        // Anyway, see bug #17954 for a testcase.
        matrix m;
+
        if ( ! def_bounds.is_null() && ! def_bounds.is_world() )
        {
-               m.set_translation(def_bounds.get_x_min(), 
def_bounds.get_y_min());
+               m.concatenate_translation(def_bounds.get_x_min(), 
def_bounds.get_y_min());
        }
+       
+       // Shift by two additional pixels. I absolutely dislike this hack 
because
+       // it's based on empirical tests. I checked with various files 
(including
+       // various text format styles) and it seems to be work fine, though.
+       // Maybe it's really some hard-coded border in Flash.
+       // See bug #17954 for more info.
+       m.concatenate_translation(2*20.0, 2*20.0);
+       
        display_glyph_records(m, this, m_text_glyph_records,
                              m_def->get_root_def());