You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/11/03 21:36:48 UTC
svn commit: r832544 - in /incubator/pivot/trunk:
demos/src/org/apache/pivot/demos/itunes/ demos/www/
tutorials/src/org/apache/pivot/tutorials/navigation/
tutorials/src/org/apache/pivot/tutorials/text/ tutorials/www/
tutorials/www/platform_overview/ wtk...
Author: gbrown
Date: Tue Nov 3 20:36:47 2009
New Revision: 832544
URL: http://svn.apache.org/viewvc?rev=832544&view=rev
Log:
Various fixes and documentation updates.
Removed:
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/calendar.wtkx
Modified:
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.wtkx
incubator/pivot/trunk/demos/www/index.html
incubator/pivot/trunk/demos/www/web_start.jsp
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/expanders.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/rollups.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/text_inputs.wtkx
incubator/pivot/trunk/tutorials/www/expanders.html
incubator/pivot/trunk/tutorials/www/platform_overview/wtk_classes-large.png
incubator/pivot/trunk/tutorials/www/platform_overview/wtk_classes-small.png
incubator/pivot/trunk/tutorials/www/rollups.html
incubator/pivot/trunk/tutorials/www/scripting.html
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.wtkx?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.wtkx Tue Nov 3 20:36:47 2009
@@ -35,7 +35,7 @@
<rows>
<TablePane.Row height="-1">
<BoxPane styles="{verticalAlignment:'center'}">
- <TextInput textSize="32" wtkx:id="termTextInput">
+ <TextInput textSize="18" wtkx:id="termTextInput">
<componentKeyListeners>
<wtkx:script>
<![CDATA[
Modified: incubator/pivot/trunk/demos/www/index.html
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/index.html?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/index.html (original)
+++ incubator/pivot/trunk/demos/www/index.html Tue Nov 3 20:36:47 2009
@@ -17,7 +17,7 @@
<html>
<head>
-<title>Pivot Demos - Home Page</title>
+<title>Pivot Demos</title>
<link rel="stylesheet" href="demo.css" />
<link rel="icon" href="favicon.png" type="image/png" />
<link rel="shortcut icon" href="favicon.png" type="image/png" />
@@ -63,98 +63,82 @@
</head>
<body>
<h2>Demos</h2>
-<p>This page contains a collection of Pivot demos, running as Applets. All demos require Java 6 or greater.</p>
-<br/>
-
-<h3 align="center"><a href="web_start.jsp">Go to Web Start Demos</a></h3>
-<br/>
+<p>This page contains a collection of Pivot demos. All demos require Java 6 or greater.</p>
+<p>Note that the demos listed on this page are all executed within the browser as applets. To
+launch the demos via Java Web Start, click <a href="web_start.jsp">here</a>.
<h3><a href="kitchen_sink.html">"Kitchen Sink"</a></h3>
<p>Demonstrates a number of commonly used Pivot components.</p>
<p><img src="kitchen_sink.png"></p>
-<br/>
-<hr/>
+<hr>
<h3><a href="component_explorer.html">Component Explorer</a></h3>
-<p>An application that allows interaction with the properties, styles, and
-events offered by each stock Pivot component.</p>
+<p>Allows a user to browse the properties, styles, and events provided by each standard
+Pivot component.</p>
<p><img src="component_explorer.png"></p>
-<br/>
-<hr/>
+<hr>
<h3><a href="stock_tracker.html">Stock Tracker</a></h3>
<p>An example of a simple but practical "real world" application built using
Pivot. Monitors stock quotes provided by <a href="http://finance.yahoo.com/">Yahoo!
Finance</a>.</p>
<p><img src="stock_tracker.png"></p>
-<br/>
-<hr/>
+<hr>
<h3><a href="itunes_search.html">iTunes Search</a></h3>
<p>Simple application that allows a user to run search queries against the
iTunes Music Store and presents the results in a table view.</p>
<p><img src="itunes_search.png"></p>
-<br/>
-<hr/>
+<hr>
<h3><a href="http://ixnay.biz/charts.html">Charting</a> <img src="page_go.png"></h3>
<p>Demonstrates charting in Pivot using the JFreeChart chart provider (hosted at http://ixnay.biz).</p>
<p><img src="charts.png"></p>
-<br/>
-<hr/>
+<hr>
<h3><a href="http://www.satelliteconsulting.com/">News Ticker/Slide Show</a> <img src="page_go.png"></h3>
<p>Demonstrates Pivot used in a real-world context, used to show a news feed
and a slide show of client logos (hosted at http://www.satelliteconsulting.com).</p>
<p><img src="sci.png"></p>
-<br/>
-<hr/>
+<hr>
<h3><a href="json_viewer.html">JSON Viewer</a></h3>
<p>Allows users to visually browse a JSON structure using a TreeView component.</p>
<p><img src="json_viewer.png"></p>
-<br/>
-<hr/>
+<hr>
<h3><a href="scripting.html">Scripting</a></h3>
<p>Simple example of a Pivot application written using JavaScript.</p>
-<br/>
-<hr/>
+<hr>
<h3><a href="file_drag_drop.html">File Drag & Drop</a></h3>
<p>Demonstrates Pivot's support for drag and drop.</p>
-<br/>
-<hr/>
+<hr>
<h3><a href="table_row_editor.html">Table Row Editor</a></h3>
<p>Example of a table row editor that uses a "Family Feud"-like flip effect to
edit rows.</p>
-<br/>
-<hr/>
+<hr>
<h3><a href="animated_clock.html">Animated Clock</a></h3>
<p>Demonstrates Pivot's MovieView component, which is used to present a clock
constructed using Pivot's drawing API.</p>
<p><img src="clock.png"></p>
-<br/>
-<hr/>
+<hr>
<h3><a href="large_data.html">Large Data Sets</a></h3>
<p>Demonstrates Pivot's ability to handle large data sets of up to 1,000,000
rows.</p>
-<br/>
-<hr/>
+<hr>
<h3><a href="rss_feed.html">RSS Feed</a></h3>
<p>Demonstrates how to build a simple RSS client in Pivot.</p>
-<br/>
-<hr/>
+<hr>
<h3><a href="dom_interaction.html">DOM Interaction</a></h3>
<p>Demonstrates Pivot's support for bi-directional communication between a Pivot
application and the browser DOM.</p>
-<br/>
-<hr/>
+<hr>
<h3><a href="decorators.html">Decorators</a></h3>
<p>Demonstrates the use of "decorators" in Pivot. Decorators allow a developer to
@@ -162,24 +146,18 @@
image effects, etc. This example shows a window with a reflection decorator and
a frame with a fade decorator.</p>
<p><img src="decorators.png"></p>
-<br/>
-<hr/>
+<hr>
<h3><a href="fixed_column_table.html">Fixed Column Table</a></h3>
<p>Explains how to create a table with fixed columns in Pivot. Fixed columns are
handy when displaying tables with many columns.</p>
-<br/>
-<hr/>
+<hr>
<h3><a href="multiselect.html">Multiple Selection</a></h3>
<p>Demonstrates Pivot's use of ranges to maintain selection state in a ListView
component. This is more efficient than maintaining a list of individual
selected indexes.</p>
-<br/>
-<hr/>
-
-<h3 align="center"><a href="web_start.jsp">Go to Web Start Demos</a></h3>
-<br/>
+<hr>
</body>
</html>
Modified: incubator/pivot/trunk/demos/www/web_start.jsp
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/web_start.jsp?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/web_start.jsp (original)
+++ incubator/pivot/trunk/demos/www/web_start.jsp Tue Nov 3 20:36:47 2009
@@ -56,6 +56,10 @@
font-size:11px;
}
+td {
+ vertical-align:middle;
+}
+
img {
vertical-align: middle;
}
@@ -64,186 +68,219 @@
<%@ include file="jnlp_common.jsp" %>
</head>
<body>
-<h2>Demos</h2>
-<p>This page contains a collection of Pivot demos, running with Java Web Start. All demos require Java 6 or greater.</p>
-<br/>
-
-<h3 align="center"><a href="index.html">Return to Pivot Demos Home Page</a></h3>
-<br/>
+<h2>Web Start Demos</h2>
+<p>This page contains a collection of Pivot demos. All demos require Java 6 or greater.</p>
+<p>The demos listed on this page are all executed via Java Web Start. To launch the demos within the browser as applets, click <a href="index.html">here</a>.
<h3>"Kitchen Sink"</h3>
<p>Demonstrates a number of commonly used Pivot components.</p>
<p><img src="kitchen_sink.png"></p>
-<br/>
-<div>
-Unsigned:
+
+<table>
+<tr>
+<td>
+Unsigned:
<script>
var url = "<%= codebase %>kitchen_sink.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
- ,
-Signed:
+</td>
+<td>
+Signed:
<script>
var url = "<%= codebase %>kitchen_sink.signed.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
- ,
-Signed with Custom Colors:
+</td>
+<td>
+Signed, with custom color scheme:
<script>
var url = "<%= codebase %>kitchen_sink.custom_colors.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>Component Explorer</h3>
-<p>An application that allows interaction with the properties, styles, and
-events offered by each stock Pivot component.</p>
+<p>Allows a user to browse the properties, styles, and events provided by each standard
+Pivot component.</p>
<p><img src="component_explorer.png"></p>
-<br/>
-<div>
-Unsigned:
+
+<table>
+<tr>
+<td>
+Unsigned:
<script>
var url = "<%= codebase %>component_explorer.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>Stock Tracker</h3>
<p>An example of a simple but practical "real world" application built using
Pivot. Monitors stock quotes provided by <a href="http://finance.yahoo.com/">Yahoo!
Finance</a>.</p>
<p><img src="stock_tracker.png"></p>
-<br/>
-<div>
-Signed:
+
+<table>
+<tr>
+<td>
+Signed:
<script>
var url = "<%= codebase %>stock_tracker.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
- ,
-Signed with French Locale (fr):
+</td>
+<td>
+Signed, in French locale (fr):
<script>
var url = "<%= codebase %>stock_tracker_fr.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>iTunes Search</h3>
<p>Simple application that allows a user to run search queries against the
iTunes Music Store and presents the results in a table view.</p>
<p><img src="itunes_search.png"></p>
-<br/>
-<div>
-Signed:
+
+<table>
+<tr>
+<td>
+Signed:
<script>
var url = "<%= codebase %>itunes_search.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>JSON Viewer</h3>
<p>Allows users to visually browse a JSON structure using a TreeView component.</p>
<p><img src="json_viewer.png"></p>
-<br/>
-<div>
-Signed:
+
+<table>
+<tr>
+<td>
+Signed:
<script>
var url = "<%= codebase %>json_viewer.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>Scripting</h3>
<p>Simple example of a Pivot application written using JavaScript.</p>
-<br/>
-<div>
-Unsigned:
+
+<table>
+<tr>
+<td>
+Unsigned:
<script>
var url = "<%= codebase %>scripting.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>File Drag & Drop</h3>
<p>Demonstrates Pivot's support for drag and drop.</p>
-<br/>
-<div>
-Signed:
+
+<table>
+<tr>
+<td>
+Signed:
<script>
var url = "<%= codebase %>file_drag_drop.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>Table Row Editor</h3>
<p>Example of a table row editor that uses a "Family Feud"-like flip effect to
edit rows.</p>
-<br/>
-<div>
-Unsigned:
+
+<table>
+<tr>
+<td>
+Unsigned:
<script>
var url = "<%= codebase %>table_row_editor.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>Animated Clock</h3>
<p>Demonstrates Pivot's MovieView component, which is used to present a clock
constructed using Pivot's drawing API.</p>
<p><img src="clock.png"></p>
-<br/>
-<div>
-Unsigned:
+
+<table>
+<tr>
+<td>
+Unsigned:
<script>
var url = "<%= codebase %>animated_clock.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>Large Data Sets</h3>
<p>Demonstrates Pivot's ability to handle large data sets of up to 1,000,000
rows.</p>
-<br/>
-<div>
-Unsigned:
+
+<table>
+<tr>
+<td>
+Unsigned:
<script>
var url = "<%= codebase %>large_data.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>RSS Feed</h3>
<p>Demonstrates how to build a simple RSS client in Pivot.</p>
-<br/>
-<div>
-Unsigned:
+
+<table>
+<tr>
+<td>
+Unsigned:
<script>
var url = "<%= codebase %>rss_feed.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>Decorators</h3>
<p>Demonstrates the use of "decorators" in Pivot. Decorators allow a developer to
@@ -251,50 +288,54 @@
image effects, etc. This example shows a window with a reflection decorator and
a frame with a fade decorator.</p>
<p><img src="decorators.png"></p>
-<br/>
-<div>
-Unsigned:
+
+<table>
+<tr>
+<td>
+Unsigned:
<script>
var url = "<%= codebase %>decorators.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>Fixed Column Table</h3>
<p>Explains how to create a table with fixed columns in Pivot. Fixed columns are
handy when displaying tables with many columns.</p>
-<br/>
-<div>
-Unsigned:
+
+<table>
+<tr>
+<td>
+Unsigned:
<script>
var url = "<%= codebase %>fixed_column_table.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
+</td>
+</tr>
+</table>
+<hr>
<h3>Multiple Selection</h3>
<p>Demonstrates Pivot's use of ranges to maintain selection state in a ListView
component. This is more efficient than maintaining a list of individual
selected indexes.</p>
-<br/>
-<div>
-Unsigned:
+
+<table>
+<tr>
+<td>
+Unsigned:
<script>
var url = "<%= codebase %>multiselect.jnlp";
deployJava.createWebStartLaunchButton(url, '1.6');
</script>
-
-</div>
-<hr/>
-
-<br/>
-
-<h3 align="center"><a href="index.html">Return to Pivot Demos Home Page</a></h3>
-<br/>
+</td>
+</tr>
+</table>
+<hr>
</body>
</html>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/expanders.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/expanders.wtkx?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/expanders.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/expanders.wtkx Tue Nov 3 20:36:47 2009
@@ -38,7 +38,7 @@
</Expander>
<Expander wtkx:id="calendarExpander" title="Calendar" expanded="false">
<content>
- <wtkx:include src="calendar.wtkx"/>
+ <Calendar/>
</content>
</Expander>
</BoxPane>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/rollups.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/rollups.wtkx?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/rollups.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/rollups.wtkx Tue Nov 3 20:36:47 2009
@@ -47,7 +47,7 @@
<Label text="Calendar" styles="{font:{bold:true}, color:13}"/>
</heading>
<content>
- <wtkx:include src="calendar.wtkx"/>
+ <Calendar/>
</content>
</Rollup>
<Rollup styles="{fill:true}">
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/text_inputs.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/text_inputs.wtkx?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/text_inputs.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/text_inputs.wtkx Tue Nov 3 20:36:47 2009
@@ -22,7 +22,7 @@
<content>
<BoxPane styles="{padding:4, verticalAlignment:'center'}">
<Label text="State:"/>
- <TextInput wtkx:id="stateTextInput" textSize="20"/>
+ <TextInput wtkx:id="stateTextInput"/>
</BoxPane>
</content>
</Window>
Modified: incubator/pivot/trunk/tutorials/www/expanders.html
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/www/expanders.html?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/www/expanders.html (original)
+++ incubator/pivot/trunk/tutorials/www/expanders.html Tue Nov 3 20:36:47 2009
@@ -78,7 +78,7 @@
</Expander>
<Expander wtkx:id="calendarExpander" title="Calendar" expanded="false">
<content>
- <wtkx:include src="calendar.wtkx"/>
+ <Calendar/>
</content>
</Expander>
</BoxPane>
Modified: incubator/pivot/trunk/tutorials/www/platform_overview/wtk_classes-large.png
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/www/platform_overview/wtk_classes-large.png?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/www/platform_overview/wtk_classes-small.png
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/www/platform_overview/wtk_classes-small.png?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/tutorials/www/rollups.html
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/www/rollups.html?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/www/rollups.html (original)
+++ incubator/pivot/trunk/tutorials/www/rollups.html Tue Nov 3 20:36:47 2009
@@ -91,7 +91,7 @@
<Label text="Calendar" styles="{fontBold:true, color:13}"/>
</heading>
<content>
- <wtkx:include src="calendar.wtkx"/>
+ <Calendar/>
</content>
</Rollup>
<Rollup styles="{fill:true}">
Modified: incubator/pivot/trunk/tutorials/www/scripting.html
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/www/scripting.html?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/www/scripting.html (original)
+++ incubator/pivot/trunk/tutorials/www/scripting.html Tue Nov 3 20:36:47 2009
@@ -57,8 +57,8 @@
+ ",lib/pivot-wtk-" + version + ".jar"
+ ",lib/pivot-wtk-" + version + ".terra.jar"
+ ",lib/pivot-tutorials-" + version + ".jar",
- width:640,
- height:480
+ width:480,
+ height:360
};
var parameters = {application_class_name:"org.apache.pivot.tutorials.scripting.Scripting",
codebase_lookup:false,
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextInput.java Tue Nov 3 20:36:47 2009
@@ -218,7 +218,7 @@
private TextInputCharacterListenerList textInputCharacterListeners = new TextInputCharacterListenerList();
private TextInputSelectionListenerList textInputSelectionListeners = new TextInputSelectionListenerList();
- public static final int DEFAULT_TEXT_SIZE = 12;
+ public static final int DEFAULT_TEXT_SIZE = 16;
public TextInput() {
installThemeSkin(TextInput.class);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java?rev=832544&r1=832543&r2=832544&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraExpanderSkin.java Tue Nov 3 20:36:47 2009
@@ -399,7 +399,7 @@
int contentHeight = Math.max(height - (3 + padding.top + padding.bottom + titleBarHeight), 0);
clipDecorator.setSize(contentWidth, contentHeight);
- content.setSize(content.getPreferredSize());
+ content.setSize(contentWidth, content.getPreferredHeight(contentWidth));
int contentX = 1 + padding.left;
int contentY = 2 + padding.top + titleBarHeight;