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

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/07/23 14:02:55

Modified files:
        .              : ChangeLog 
        server         : edit_text_character.cpp 

Log message:
        server/edit_text_character.cpp: make get_world_cxform() again 
Windows-compatible (relevant code is still disabled, so no visible difference 
until we have finished discussing this)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3790&r2=1.3791
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.88&r2=1.89

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.3790
retrieving revision 1.3791
diff -u -b -r1.3790 -r1.3791
--- ChangeLog   23 Jul 2007 13:49:43 -0000      1.3790
+++ ChangeLog   23 Jul 2007 14:02:55 -0000      1.3791
@@ -1,3 +1,9 @@
+2007-07-23 Udo Giacomozzi <address@hidden>
+
+       * server/edit_text_character.cpp: make get_world_cxform() again
+         Windows-compatible (relevant code is still disabled, so no
+         visible difference until we have finished discussing this)
+
 2007-07-23 Sandro Santilli <address@hidden>
 
        * gui/Makefile.am, testsuite/misc-mtasc.all/Makefile.am:

Index: server/edit_text_character.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- server/edit_text_character.cpp      23 Jul 2007 04:34:26 -0000      1.88
+++ server/edit_text_character.cpp      23 Jul 2007 14:02:55 -0000      1.89
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.88 2007/07/23 04:34:26 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.89 2007/07/23 14:02:55 udog Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1431,14 +1431,19 @@
 cxform 
 edit_text_character::get_world_cxform() const
 {
-  if ( 0 /* if using a device font (PP compatibility, TODO) */ )
-  {
-       return cxform();
-  }
-  else
-  {
-     return character::get_world_cxform();
+  cxform cf = character::get_world_cxform();
+  
+  if ( 0 /* if using a device font (PP compatibility, TODO) */ ) {
+    // set alpha to default values to make the text field opaque
+    cf.m_[3][0] = 1.0f;
+    cf.m_[3][1] = 0.0f;
+    
+    // NOTE: Linux version of Adobe's player also ignores tint
+    // transform, so we should (or not) return an identity cxform
+    // here. This has to be discussed...
   }
+  
+  return cf;
 }
 
 static as_value