[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/edit_text_character.cpp
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/edit_text_character.cpp |
Date: |
Thu, 19 Jul 2007 15:01:15 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/07/19 15:01:15
Modified files:
. : ChangeLog
server : edit_text_character.cpp
Log message:
* server/edit_text_character.cpp (attachTextFieldInterface):
fix a bug swapping .border and .borderColor semantic (!).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3767&r2=1.3768
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.78&r2=1.79
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3767
retrieving revision 1.3768
diff -u -b -r1.3767 -r1.3768
--- ChangeLog 19 Jul 2007 14:44:28 -0000 1.3767
+++ ChangeLog 19 Jul 2007 15:01:14 -0000 1.3768
@@ -1,5 +1,7 @@
2007-07-19 Sandro Santilli <address@hidden>
+ * server/edit_text_character.cpp (attachTextFieldInterface):
+ fix a bug swapping .border and .borderColor semantic (!).
* configure.ac: test(1) string equality operator is "=",
not "==". Other attempt at fixing bug #20525.
Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- server/edit_text_character.cpp 18 Jul 2007 03:47:31 -0000 1.78
+++ server/edit_text_character.cpp 19 Jul 2007 15:01:15 -0000 1.79
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: edit_text_character.cpp,v 1.78 2007/07/18 03:47:31 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.79 2007/07/19 15:01:15 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -318,11 +318,12 @@
o.init_property("background", *getset, *getset);
getset = new builtin_function(textfield_backgroundColor_getset);
o.init_property("backgroundColor", *getset, *getset);
- getset = new builtin_function(textfield_borderColor_getset);
- o.init_property("border", *getset, *getset);
getset = new builtin_function(textfield_border_getset);
+ o.init_property("border", *getset, *getset);
+ getset = new builtin_function(textfield_borderColor_getset);
o.init_property("borderColor", *getset, *getset);
+
if ( target_version < 7 ) return;
// SWF7 or higher
@@ -441,6 +442,7 @@
bool drawBorder = getDrawBorder();
bool drawBackground = getDrawBackground();
+
if ( drawBorder || drawBackground )
{
matrix mat = get_world_matrix();
@@ -462,8 +464,6 @@
rgba borderColor = drawBorder ? getBorderColor() :
rgba(0,0,0,0);
rgba backgroundColor = drawBackground ? getBackgroundColor() :
rgba(255,255,255,0);
- //log_debug("Border color : %s, Background color : %s",
borderColor.toString().c_str(), backgroundColor.toString().c_str());
-
render::draw_poly( &coords[0], 4, backgroundColor, borderColor
);
}
@@ -1431,7 +1431,6 @@
static as_value
textfield_background_getset(const fn_call& fn)
{
- GNASH_REPORT_FUNCTION;
boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
if ( fn.nargs == 0 ) // getter
@@ -1466,8 +1465,6 @@
static as_value
textfield_backgroundColor_getset(const fn_call& fn)
{
- GNASH_REPORT_FUNCTION;
-
boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
if ( fn.nargs == 0 ) // getter
- [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp,
Sandro Santilli <=
- [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp, Sandro Santilli, 2007/07/20
- [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp, Udo Giacomozzi, 2007/07/20
- [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp, Sandro Santilli, 2007/07/22
- [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp, Sandro Santilli, 2007/07/22
- [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp, Udo Giacomozzi, 2007/07/23
- [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp, Sandro Santilli, 2007/07/24
- [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp, Sandro Santilli, 2007/07/24
- [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp, Sandro Santilli, 2007/07/24