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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/11 11:02:39

Modified files:
        .              : ChangeLog 
        server         : edit_text_character.cpp edit_text_character.h 

Log message:
        implement get_width() and get_height()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1137&r2=1.1138
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1137
retrieving revision 1.1138
diff -u -b -r1.1137 -r1.1138
--- ChangeLog   11 Oct 2006 11:00:37 -0000      1.1137
+++ ChangeLog   11 Oct 2006 11:02:39 -0000      1.1138
@@ -1,5 +1,7 @@
 2006-10-11 Sandro Santilli <address@hidden>
 
+       * server/edit_text_character.{cpp,h}: implemented get_width() and
+         get_height().
        * server/character.h: added comment to get_width() and get_height()
          virtual function (return in TWIPS). added a warning log when
          a subclass did not override these.

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/edit_text_character.cpp      8 Oct 2006 16:11:37 -0000       1.17
+++ server/edit_text_character.cpp      11 Oct 2006 11:02:39 -0000      1.18
@@ -3,7 +3,7 @@
 // This source code has been donated to the Public Domain.  Do
 // whatever you want with it.
 
-/* $Id: edit_text_character.cpp,v 1.17 2006/10/08 16:11:37 nihilus Exp $ */
+/* $Id: edit_text_character.cpp,v 1.18 2006/10/11 11:02:39 strk Exp $ */
 
 #include "utf8.h"
 #include "log.h"
@@ -422,24 +422,14 @@
                val->set_double(TWIPS_TO_PIXELS(m.m_[1][2]));
                return true;
        }
-       case M_WIDTH:
-               //else if (name == "_width")
+       case M_WIDTH: // _width
        {
-               // @@ TODO should implement this in
-               // character and inherit into both here and sprite_instance
-               rect    transformed_rect;
-               transformed_rect.enclose_transformed_rect(get_world_matrix(), 
m_def->get_bounds());
-               val->set_double(TWIPS_TO_PIXELS(transformed_rect.width()));
+               val->set_double(TWIPS_TO_PIXELS(get_width()));
                return true;
        }
-       case M_HEIGHT:
-               //else if (name == "_height")
+       case M_HEIGHT: // _height
        {
-               // @@ TODO should implement this in
-               // character and inherit into both here and sprite_instance
-               rect    transformed_rect;
-               transformed_rect.enclose_transformed_rect(get_world_matrix(), 
m_def->get_bounds());
-               val->set_double(TWIPS_TO_PIXELS(transformed_rect.height()));
+               val->set_double(TWIPS_TO_PIXELS(get_height()));
                return true;
        }
        case M_TEXTWIDTH:
@@ -852,6 +842,32 @@
 
 }
 
+float
+edit_text_character::get_height() const
+{
+       // @@ TODO should implement this in
+       // character and inherit into both here and sprite_instance
+       rect    transformed_rect;
+       transformed_rect.enclose_transformed_rect(get_world_matrix(), 
m_def->get_bounds());
+       return transformed_rect.height();
+
+       log_error("%s: not implmented yet", __PRETTY_FUNCTION__);
+       return 0;
+}
+
+float
+edit_text_character::get_width() const
+{
+       // @@ TODO should implement this in
+       // character and inherit into both here and sprite_instance
+       rect    transformed_rect;
+       transformed_rect.enclose_transformed_rect(get_world_matrix(), 
m_def->get_bounds());
+       return transformed_rect.width();
+
+       log_error("%s: not implmented yet", __PRETTY_FUNCTION__);
+       return 0;
+}
+
 } // namespace gnash
 
 

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/edit_text_character.h        24 Sep 2006 20:17:04 -0000      1.11
+++ server/edit_text_character.h        11 Oct 2006 11:02:39 -0000      1.12
@@ -94,6 +94,9 @@
        /// Draw the dynamic string.
        void    display();
 
+       virtual float   get_height() const;
+       virtual float   get_width() const;
+
 private:
 
        /// The actual text