[Laszlo-checkins] r13144 - in openlaszlo/branches/4.2: . lps/components/lz
ptw@openlaszlo.org
ptw at openlaszlo.org
Tue Mar 3 13:38:59 PST 2009
Author: ptw
Date: 2009-03-03 13:38:53 -0800 (Tue, 03 Mar 2009)
New Revision: 13144
Modified:
openlaszlo/branches/4.2/
openlaszlo/branches/4.2/lps/components/lz/list.lzx
Log:
Merged revisions 12628 via svnmerge from
http://svn.openlaszlo.org/openlaszlo/trunk
.......
r12628 | pbr | 2009-01-23 17:35:55 -0500 (Fri, 23 Jan 2009) | 39 lines
Change 20090123-Philip-4 by Philip at Philip-DC on 2009-01-23 09:14:09 EST
in /cygdrive/f/laszlo/svn/src/svn/openlaszlo/trunk
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: dhtml: Fix list regression
New Features:
Bugs Fixed: LPP-7524
Technical Reviewer: ptw
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
The fast setter change caused this issue. There are two components (list and windowpanel) that override bgcolor setter because subviews handle the actual drawing. windowpanel is ok, but the changes made to list does not work. I reverted the change to be similar to how it used to be. The bgcolor setter sets _bgcolor and this is where the 'interior' view gets its data.
Tests:
The test case in the jira report displays the correct (ie. white) background:
<canvas>
<list name="env" width="250" height="200">
<textlistitem text="123" />
<textlistitem text="456" />
<textlistitem text="789" />
</list>
</canvas>
Files:
M lps/components/lz/list.lzx
Changeset: http://svn.openlaszlo.org/openlaszlo/patches/20090123-Philip-4.tar
.......
Property changes on: openlaszlo/branches/4.2
___________________________________________________________________
Name: svnmerge-integrated
- /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-12154,12172-12175,12177-12185,12187-12194,12196,12201,12208,12229,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323,12340-12348,12352,12354-12358,12360-12361,12363,12365-12367,12369-12371,12375-12378,12380-12389,12391,12394-12396,12399-12400,12402-12403,12406-12416,12419-12422,12424-12429,12431-12433,12435,12437-12441,12443,12445,12447,12449-12451,12453-12454,12457-12460,12464,12466-12475,12477-12480,12482-12490,12493-12495,12499-12502,12507-12510,12512,12514-12520,12522,12525-12531,12534-12540,12542,12545,12548-12554,12557-12561,12564,12566-12568,12571,12574-12576,12578,12580,12583-12584,12586-12587,12589,12592-12596,12598-12600,12602-12609,12611-12615,12617,12619-12621,12623,12625,12629-12631,12633-12635,12637,12639,12642,12644,12647-12653,12656,12658,12660,12662-12666,12668-12694,12696,12698-12704,12708-12710,12712-12721,12723-12729,12731-12742,12745-12752,12754-12784,12786-12791,12793-12798,12800-12801,12803,12805-12808,12810-12812,12814,12816-12821,12825-12833,12835-12837,12839-12841,12847,12849-12850,12852-12859,12863-12883,12885-12895,12897-12906,12908-12915,12917-12922,12924-12934,12937-12940,12943-12944,12946-12947,12950-12952,12955-12964,12966-12969,12971,12973-12977,12979-12993,12997-12999,13001-13003,13006-13007,13010-13015,13017-13020,13022-13024,13026-13031,13033,13035-13037,13039-13040,13043,13046-13052,13055-13060,13062-13069,13071-13072,13074,13076-13085,13087-13093,13095-13101,13103-13104,13106,13108-13110,13112,13114-13120,13122,13125-13126,13129,13132-13136,13139-13140,13142
+ /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-12154,12172-12175,12177-12185,12187-12194,12196,12201,12208,12229,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323,12340-12348,12352,12354-12358,12360-12361,12363,12365-12367,12369-12371,12375-12378,12380-12389,12391,12394-12396,12399-12400,12402-12403,12406-12416,12419-12422,12424-12429,12431-12433,12435,12437-12441,12443,12445,12447,12449-12451,12453-12454,12457-12460,12464,12466-12475,12477-12480,12482-12490,12493-12495,12499-12502,12507-12510,12512,12514-12520,12522,12525-12531,12534-12540,12542,12545,12548-12554,12557-12561,12564,12566-12568,12571,12574-12576,12578,12580,12583-12584,12586-12587,12589,12592-12596,12598-12600,12602-12609,12611-12615,12617,12619-12621,12623,12625,12628-12631,12633-12635,12637,12639,12642,12644,12647-12653,12656,12658,12660,12662-12666,12668-12694,12696,12698-12704,12708-12710,12712-12721,12723-12729,12731-12742,12745-12752,12754-12784,12786-12791,12793-12798,12800-12801,12803,12805-12808,12810-12812,12814,12816-12821,12825-12833,12835-12837,12839-12841,12847,12849-12850,12852-12859,12863-12883,12885-12895,12897-12906,12908-12915,12917-12922,12924-12934,12937-12940,12943-12944,12946-12947,12950-12952,12955-12964,12966-12969,12971,12973-12977,12979-12993,12997-12999,13001-13003,13006-13007,13010-13015,13017-13020,13022-13024,13026-13031,13033,13035-13037,13039-13040,13043,13046-13052,13055-13060,13062-13069,13071-13072,13074,13076-13085,13087-13093,13095-13101,13103-13104,13106,13108-13110,13112,13114-13120,13122,13125-13126,13129,13132-13136,13139-13140,13142
Modified: openlaszlo/branches/4.2/lps/components/lz/list.lzx
===================================================================
--- openlaszlo/branches/4.2/lps/components/lz/list.lzx 2009-03-03 21:25:59 UTC (rev 13143)
+++ openlaszlo/branches/4.2/lps/components/lz/list.lzx 2009-03-03 21:38:53 UTC (rev 13144)
@@ -68,7 +68,7 @@
y="${classroot.border_top}"
width="${classroot.width
- classroot.border_right - classroot.border_left}"
- bgcolor="${classroot.bgcolor}"
+ bgcolor="${classroot._bgcolor}"
clip="true">
<!-- height of this view is set in class' adjustheight method -->
@@ -286,15 +286,20 @@
<!--- @keywords private -->
<attribute name="_setbordercolor" value="false" type="boolean" />
+ <!--- Used to pass bgcolor to 'interior' without affecting the
+ bgcolor of the class.
+ @keywords private -->
+ <attribute name="_bgcolor" value="null"/>
+
<!--- @keywords private -->
<setter name="bgcolor" args="c"> <![CDATA[
if (this._setbordercolor) {
super.setAttribute('bgcolor', c);
}
else {
- // DON'T call the super setter, we take over bgcolor to control
- // the bgcolor of the content pane.
- this.bgcolor = c;
+ // DON'T call the super setter, 'interior' view
+ // sets its bgcolor from this attribute
+ this._bgcolor = c;
var event = this['onbgcolor'];
if (event && event.ready) {
event.sendEvent(c);
@@ -309,7 +314,7 @@
this._setbordercolor = true;
this.setAttribute('bgcolor', s.bordercolor);
this._setbordercolor = false;
- if (this.bgcolor == null) this.interior.setAttribute('bgcolor', s.bgcolor);
+ if (this._bgcolor == null) this.interior.setAttribute('bgcolor', s.bgcolor);
}
</method>
@@ -362,7 +367,7 @@
</library>
<!-- * X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2001-2008 Laszlo Systems, Inc. All Rights Reserved. *
+* Copyright 2001-2009 Laszlo Systems, Inc. All Rights Reserved. *
* Use is subject to license terms. *
* X_LZ_COPYRIGHT_END ****************************************************** -->
<!-- @LZX_VERSION@ -->
More information about the Laszlo-checkins
mailing list