[Laszlo-checkins] r12361 - in openlaszlo/branches/4.2: . WEB-INF/lps/lfc/kernel/swf test/lztest

[ptw@openlaszlo.org]

Author: ptw
Date: 2009-01-08 05:52:04 -0800 (Thu, 08 Jan 2009)
New Revision: 12361

Modified:
   openlaszlo/branches/4.2/
   openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzTextSprite.as
   openlaszlo/branches/4.2/test/lztest/lztest-textheight.lzx
Log:
Merged revisions 12360 via svnmerge from 
http://svn.openlaszlo.org/openlaszlo/trunk

.......
  r12360 | bargull | 2009-01-08 08:18:35 -0500 (Thu, 08 Jan 2009) | 26 lines
  
  Change 20090108-bargull-ggO by bargull at dell--p4--2-53 on 2009-01-08 12:29:40
      in /home/Admin/src/svn/openlaszlo/trunk
      for http://svn.openlaszlo.org/openlaszlo/trunk
  
  Summary: fix for small multiline texts
  
  New Features:
  
  Bugs Fixed: LPP-7586
  
  Technical Reviewer: max
  QA Reviewer: (pending)
  Doc Reviewer: (pending)
  
  Documentation:
  
  Release Notes:
  
  Details:
  set "wordWrap" to false when you measure the height of an empty textfield.
      
  
  Tests:
  testcase from bugreport
.......



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,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323,12345
   + /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,12251-12252,12254-12255,12257-12258,12260,12262-12266,12268-12269,12271-12275,12278-12285,12303,12318-12323,12345,12360

Modified: openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzTextSprite.as
===================================================================
--- openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzTextSprite.as	2009-01-08 13:18:35 UTC (rev 12360)
+++ openlaszlo/branches/4.2/WEB-INF/lps/lfc/kernel/swf/LzTextSprite.as	2009-01-08 13:52:04 UTC (rev 12361)
@@ -291,8 +291,12 @@
     // Measure test string if the field is empty
     if (h == 4) {
         var tct = textclip.htmlText;
+        var tcp = textclip.wordWrap;
+        // Make sure the test text does not wrap!
+        textclip.wordWrap = false;
         textclip.htmlText = "__ypgSAMPLE__";
         var h = textclip._height;
+        textclip.wordWrap = tcp;
         textclip.htmlText = tct;
     }
 

Modified: openlaszlo/branches/4.2/test/lztest/lztest-textheight.lzx
===================================================================
--- openlaszlo/branches/4.2/test/lztest/lztest-textheight.lzx	2009-01-08 13:18:35 UTC (rev 12360)
+++ openlaszlo/branches/4.2/test/lztest/lztest-textheight.lzx	2009-01-08 13:52:04 UTC (rev 12361)
@@ -72,6 +72,10 @@
         <text fontsize="20" text="Click Me 2" id="t14"/>
         <text fontsize="${canvas.gfontSize}" id="t15" text="Click Me 1" resize="true"/>
         <text fontsize="20" resize="true" id="t16" text="Click Me 2"/>
+
+        <!-- from LPP-7586 -->
+        <text id="t17" multiline="false" width="50" bgcolor="#aeaeae" />
+        <text id="t18" multiline="true" width="50" bgcolor="#aeaeae" />
     </view>
 
     <view name="inputtexts">
@@ -148,6 +152,8 @@
     LzTestManager.assertEquals(28, t16.height, "text16 height");
     t16.setAttribute('fontsize',50);
     LzTestManager.assertEquals(64, t16.height, "text16 height");
+
+    LzTestManager.assertEquals(t17.height, t18.height, "text18 height");
 }
 
 textSizeSuite.testInputtextHeight = function () {
@@ -216,7 +222,7 @@
 </canvas>
 <!-- 
 /* X_LZ_COPYRIGHT_BEGIN ***************************************************
-* Copyright 2007-2008 Laszlo Systems, Inc.  All Rights Reserved.          *
+* Copyright 2007-2009 Laszlo Systems, Inc.  All Rights Reserved.          *
 * Use is subject to license terms.                                        *
 * X_LZ_COPYRIGHT_END ******************************************************/
 -->