[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: |
Udo Giacomozzi |
Subject: |
[Gnash-commit] gnash ChangeLog server/edit_text_character.cpp |
Date: |
Fri, 20 Jul 2007 16:11:02 +0000 |
CVSROOT: /cvsroot/gnash
Module name: gnash
Changes by: Udo Giacomozzi <udog> 07/07/20 16:11:02
Modified files:
. : ChangeLog
server : edit_text_character.cpp
Log message:
server/edit_text_character.cpp: fix background and cxform for text
fields
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3776&r2=1.3777
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.81&r2=1.82
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.3776
retrieving revision 1.3777
diff -u -b -r1.3776 -r1.3777
--- ChangeLog 20 Jul 2007 15:32:17 -0000 1.3776
+++ ChangeLog 20 Jul 2007 16:11:02 -0000 1.3777
@@ -1,3 +1,8 @@
+2007-07-20 Udo Giacomozzi <address@hidden>
+
+ * server/edit_text_character.cpp: fix background and cxform for
+ text fields
+
2007-07-20 Sandro Santilli <address@hidden>
* server/edit_text_character.cpp (display): make the default
Index: server/edit_text_character.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- server/edit_text_character.cpp 20 Jul 2007 15:32:18 -0000 1.81
+++ server/edit_text_character.cpp 20 Jul 2007 16:11:02 -0000 1.82
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: edit_text_character.cpp,v 1.81 2007/07/20 15:32:18 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.82 2007/07/20 16:11:02 udog Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -378,7 +378,7 @@
m_ycursor(0.0f),
_text_variable_registered(false),
_variable_name(m_def->get_variable_name()),
- _drawBackground(false),
+ _drawBackground(m_def->has_border()),
_backgroundColor(255,255,255,255),
_drawBorder(m_def->has_border()),
_borderColor(0,0,0,255)
@@ -460,16 +460,22 @@
coords[1] = def_bounds.get_corner(1);
coords[2] = def_bounds.get_corner(2);
coords[3] = def_bounds.get_corner(3);
-
+printf("\n\ndrawBorder = %d\n", drawBorder);
rgba borderColor = drawBorder ? getBorderColor() :
rgba(0,0,0,0);
- rgba backgroundColor = drawBackground ? getBackgroundColor() :
rgba(255,255,255,255);
- if ( 0 ) // should be if ! isDynamic to be PP-compatible (or is
it about device font? to be tested)
+printf("drawBackground = %d\n", drawBackground);
+ rgba backgroundColor = drawBackground ? getBackgroundColor() :
rgba(0,0,0,0);
+
+ if ( 1 ) // should be if ! isDynamic to be PP-compatible (or is
it about device font? to be tested)
// Currently disabled due to what looks like a bug in
color transform
{
cxform cx = get_world_cxform();
log_debug("world cxform for textfield %s: %s",
getTargetPath().c_str(), cx.toString().c_str());
+
+ if (drawBorder)
borderColor = cx.transform(borderColor);
+
+ if (drawBackground)
backgroundColor = cx.transform(backgroundColor);
}
- [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp, Sandro Santilli, 2007/07/19
- [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 <=
- [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
- [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp, Sandro Santilli, 2007/07/25