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/08/07 06:33:07 UTC
svn commit: r801880 - in /incubator/pivot/trunk:
demos/src/org/apache/pivot/demos/dnd/
demos/src/org/apache/pivot/demos/million/
tools/src/org/apache/pivot/tools/net/
tutorials/src/org/apache/pivot/tutorials/layout/
tutorials/src/org/apache/pivot/tutor...
Author: gbrown
Date: Fri Aug 7 04:33:06 2009
New Revision: 801880
URL: http://svn.apache.org/viewvc?rev=801880&view=rev
Log:
Revert previous change to pref. aspect ratio in TerraPushButtonSkin and rename style to minimumPreferredAspectRatio.
Modified:
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/large_data.wtkx
incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/detailsFrame.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/flow_panes.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/forms.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/payment.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/shipping.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/summary.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/activity_indicators.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/meters.wtkx
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PushButtonTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SheetTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/flow_pane_test.wtkx
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/preferred_aspect_ratio_test.wtkx
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx Fri Aug 7 04:33:06 2009
@@ -63,7 +63,7 @@
<TablePane.Row height="-1">
<BoxPane styles="{padding:6, horizontalAlignment:'right', verticalAlignment:'center'}">
<PushButton wtkx:id="uploadButton" buttonData="Upload"
- enabled="false" styles="{preferredAspectRatio:3}"/>
+ enabled="false" styles="{minimumPreferredAspectRatio:3}"/>
</BoxPane>
</TablePane.Row>
</rows>
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/large_data.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/large_data.wtkx?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/large_data.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/large_data.wtkx Fri Aug 7 04:33:06 2009
@@ -32,8 +32,8 @@
<BoxPane>
<ListButton wtkx:id="fileListButton"
listData="['10e0.csv', '10e1.csv', '10e2.csv', '10e3.csv', '10e4.csv', '10e5.csv']" selectedIndex="0"/>
- <PushButton wtkx:id="loadDataButton" buttonData="Load Data" styles="{preferredAspectRatio:3}"/>
- <PushButton wtkx:id="cancelButton" buttonData="Cancel" enabled="false" styles="{preferredAspectRatio:3}"/>
+ <PushButton wtkx:id="loadDataButton" buttonData="Load Data" styles="{minimumPreferredAspectRatio:3}"/>
+ <PushButton wtkx:id="cancelButton" buttonData="Cancel" enabled="false" styles="{minimumPreferredAspectRatio:3}"/>
</BoxPane>
<Label wtkx:id="statusLabel"/>
<Separator/>
Modified: incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/detailsFrame.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/detailsFrame.wtkx?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/detailsFrame.wtkx (original)
+++ incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/detailsFrame.wtkx Fri Aug 7 04:33:06 2009
@@ -60,9 +60,9 @@
</TablePane.Row>
<TablePane.Row height="-1">
<BoxPane styles="{spacing:6,horizontalAlignment:'right'}">
- <PushButton wtkx:id="previousButton" buttonData="Previous" styles="{preferredAspectRatio:3, padding:5, backgroundColor:16, borderColor:13, color:4, fontBold:true}"/>
- <PushButton wtkx:id="nextButton" buttonData="Next" styles="{preferredAspectRatio:3, padding:5, backgroundColor:16, borderColor:13, color:4, fontBold:true}"/>
- <PushButton wtkx:id="closeButton" buttonData="Close" styles="{preferredAspectRatio:3, padding:5, backgroundColor:16, borderColor:13, color:4, fontBold:true}"/>
+ <PushButton wtkx:id="previousButton" buttonData="Previous" styles="{minimumPreferredAspectRatio:3, padding:5, backgroundColor:16, borderColor:13, color:4, fontBold:true}"/>
+ <PushButton wtkx:id="nextButton" buttonData="Next" styles="{minimumPreferredAspectRatio:3, padding:5, backgroundColor:16, borderColor:13, color:4, fontBold:true}"/>
+ <PushButton wtkx:id="closeButton" buttonData="Close" styles="{minimumPreferredAspectRatio:3, padding:5, backgroundColor:16, borderColor:13, color:4, fontBold:true}"/>
</BoxPane>
</TablePane.Row>
</rows>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/flow_panes.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/flow_panes.wtkx?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/flow_panes.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/flow_panes.wtkx Fri Aug 7 04:33:06 2009
@@ -25,14 +25,14 @@
<Border styles="{padding:0}">
<content>
<FlowPane wtkx:id="flowPane">
- <PushButton buttonData="0" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="1" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="2" styles="{preferredAspectRatio:1.5}"/>
+ <PushButton buttonData="0" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="1" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="2" styles="{minimumPreferredAspectRatio:1.5}"/>
<PushButton buttonData="3" preferredWidth="20" preferredHeight="20"/>
<PushButton buttonData="4" preferredWidth="30" preferredHeight="30"/>
<PushButton buttonData="5" preferredWidth="40" preferredHeight="40"/>
- <PushButton buttonData="6" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="7" styles="{preferredAspectRatio:1.5}"/>
+ <PushButton buttonData="6" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="7" styles="{minimumPreferredAspectRatio:1.5}"/>
</FlowPane>
</content>
</Border>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/forms.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/forms.wtkx?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/forms.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/forms.wtkx Fri Aug 7 04:33:06 2009
@@ -81,7 +81,7 @@
</BoxPane>
<BoxPane styles="{horizontalAlignment:'right', verticalAlignment:'center'}">
<PushButton wtkx:id="submitButton" buttonData="Submit"
- styles="{preferredAspectRatio:3}"/>
+ styles="{minimumPreferredAspectRatio:3}"/>
</BoxPane>
</TablePane.Row>
</rows>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/payment.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/payment.wtkx?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/payment.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/payment.wtkx Fri Aug 7 04:33:06 2009
@@ -32,7 +32,7 @@
<BoxPane styles="{horizontalAlignment:'right', backgroundColor:11,
padding:4}">
<PushButton wtkx:id="nextButton" buttonData="Next"
- styles="{preferredAspectRatio:3}"/>
+ styles="{minimumPreferredAspectRatio:3}"/>
</BoxPane>
</TablePane.Row>
</rows>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/shipping.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/shipping.wtkx?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/shipping.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/shipping.wtkx Fri Aug 7 04:33:06 2009
@@ -32,7 +32,7 @@
<BoxPane styles="{horizontalAlignment:'right', backgroundColor:11,
padding:4}">
<PushButton wtkx:id="nextButton" buttonData="Next"
- styles="{preferredAspectRatio:3}"/>
+ styles="{minimumPreferredAspectRatio:3}"/>
</BoxPane>
</TablePane.Row>
</rows>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/summary.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/summary.wtkx?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/summary.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/summary.wtkx Fri Aug 7 04:33:06 2009
@@ -38,7 +38,7 @@
</BoxPane>
<BoxPane orientation="vertical"
styles="{horizontalAlignment:'center', spacing:12, padding:{top:12}}">
- <PushButton wtkx:id="confirmOrderButton" styles="{preferredAspectRatio:3}"/>
+ <PushButton wtkx:id="confirmOrderButton" styles="{minimumPreferredAspectRatio:3}"/>
<ActivityIndicator wtkx:id="activityIndicator" styles="{color:16}"
preferredWidth="48" preferredHeight="48"/>
<Label wtkx:id="processingOrderLabel" text="Pretending to process order..." displayable="false"
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/activity_indicators.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/activity_indicators.wtkx?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/activity_indicators.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/activity_indicators.wtkx Fri Aug 7 04:33:06 2009
@@ -41,7 +41,7 @@
</TablePane.Row>
<TablePane.Row height="-1">
<BoxPane styles="{horizontalAlignment:'center', padding:6}">
- <PushButton wtkx:id="activityButton" styles="{preferredAspectRatio:3}"/>
+ <PushButton wtkx:id="activityButton" styles="{minimumPreferredAspectRatio:3}"/>
</BoxPane>
</TablePane.Row>
</rows>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/meters.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/meters.wtkx?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/meters.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/meters.wtkx Fri Aug 7 04:33:06 2009
@@ -37,7 +37,7 @@
</TablePane.Row>
<TablePane.Row height="-1">
<BoxPane styles="{horizontalAlignment:'center', padding:6}">
- <PushButton wtkx:id="progressButton" styles="{preferredAspectRatio:3}"/>
+ <PushButton wtkx:id="progressButton" styles="{minimumPreferredAspectRatio:3}"/>
</BoxPane>
</TablePane.Row>
</rows>
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ImageView.java Fri Aug 7 04:33:06 2009
@@ -98,7 +98,6 @@
throw new IllegalArgumentException("image is null.");
}
- // TODO Support asynchronous loading?
try {
setImage(Image.load(image));
} catch (TaskExecutionException exception) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ReflectionDecorator.java Fri Aug 7 04:33:06 2009
@@ -31,8 +31,6 @@
* Decorator that paints a reflection of a component.
* <p>
* TODO Make gradient properties configurable.
- * <p>
- * TODO Add a shear value.
*
* @author gbrown
*/
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/BoxPaneSkin.java Fri Aug 7 04:33:06 2009
@@ -28,9 +28,6 @@
/**
* Box pane skin.
- * <p>
- * TODO Cache preferred component sizes when alignment is justified, so we
- * don't need to recalculate them during layout.
*
* @author gbrown
*/
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ScrollPaneSkin.java Fri Aug 7 04:33:06 2009
@@ -945,7 +945,7 @@
boolean optimizeScrolling = this.optimizeScrolling;
// TODO Remove this check when we can. Sun bug 4033851 causes paint
- // artifacts while scrolling. For a full description of why this is,
+ // artifacts while scrolling. For a full description of why this is
// needed, see http://people.apache.org/~tvolkert/tests/scrolling/
// There seems to be no workaround, so we have to turn the optimization
// completely off if we're not sure that we're unobscured.
@@ -1026,7 +1026,7 @@
boolean optimizeScrolling = this.optimizeScrolling;
// TODO Remove this check when we can. Sun bug 4033851 causes paint
- // artifacts while scrolling. For a full description of why this is,
+ // artifacts while scrolling. For a full description of why this is s
// needed, see http://people.apache.org/~tvolkert/tests/scrolling/.
// There seems to be no workaround, so we have to turn the optimization
// completely off if we're not sure that we're unobscured.
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java Fri Aug 7 04:33:06 2009
@@ -99,7 +99,7 @@
optionButtonStyles.put("borderColor", theme.getColor(13));
optionButton.setStyles(optionButtonStyles);
- optionButton.getStyles().put("preferredAspectRatio", 3);
+ optionButton.getStyles().put("minimumPreferredAspectRatio", 3);
optionButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java Fri Aug 7 04:33:06 2009
@@ -97,7 +97,7 @@
optionButtonStyles.put("borderColor", theme.getColor(13));
optionButton.setStyles(optionButtonStyles);
- optionButton.getStyles().put("preferredAspectRatio", 3);
+ optionButton.getStyles().put("minimumPreferredAspectRatio", 3);
optionButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java Fri Aug 7 04:33:06 2009
@@ -49,7 +49,7 @@
private Color borderColor;
private Color disabledBorderColor;
private Insets padding;
- private float preferredAspectRatio;
+ private float minimumPreferredAspectRatio;
private boolean toolbar;
// Derived colors
@@ -68,7 +68,7 @@
borderColor = theme.getColor(7);
disabledBorderColor = theme.getColor(7);
padding = new Insets(2, 3, 2, 3);
- preferredAspectRatio = Float.NaN;
+ minimumPreferredAspectRatio = Float.NaN;
toolbar = false;
// Set the derived colors
@@ -80,27 +80,28 @@
public int getPreferredWidth(int height) {
int preferredWidth = 0;
- PushButton pushButton = (PushButton)getComponent();
-
if (height == -1
- && !Float.isNaN(preferredAspectRatio)) {
+ && !Float.isNaN(minimumPreferredAspectRatio)) {
preferredWidth = getPreferredSize().width;
} else {
- if (Float.isNaN(preferredAspectRatio)) {
- preferredWidth = (int)(preferredAspectRatio * height);
- } else {
- Button.DataRenderer dataRenderer = pushButton.getDataRenderer();
+ PushButton pushButton = (PushButton)getComponent();
+ Button.DataRenderer dataRenderer = pushButton.getDataRenderer();
- dataRenderer.render(pushButton.getButtonData(), pushButton, false);
+ dataRenderer.render(pushButton.getButtonData(), pushButton, false);
+
+ // Include padding in constraint
+ int contentHeight = height;
+ if (contentHeight != -1) {
+ contentHeight = Math.max(contentHeight - (padding.top + padding.bottom + 2), 0);
+ }
- // Include padding in constraint
- int contentHeight = height;
- if (contentHeight != -1) {
- contentHeight = Math.max(contentHeight - (padding.top + padding.bottom + 2), 0);
- }
+ preferredWidth = dataRenderer.getPreferredWidth(contentHeight)
+ + padding.left + padding.right + 2;
- preferredWidth = dataRenderer.getPreferredWidth(contentHeight)
- + padding.left + padding.right + 2;
+ // Adjust for preferred aspect ratio
+ if (!Float.isNaN(minimumPreferredAspectRatio)
+ && (float)preferredWidth / (float)height < minimumPreferredAspectRatio) {
+ preferredWidth = (int)(height * minimumPreferredAspectRatio);
}
}
@@ -111,25 +112,27 @@
int preferredHeight = 0;
if (width== -1
- && !Float.isNaN(preferredAspectRatio)) {
+ && !Float.isNaN(minimumPreferredAspectRatio)) {
preferredHeight = getPreferredSize().height;
} else {
- if (!Float.isNaN(preferredAspectRatio)) {
- preferredHeight = (int)(width / preferredAspectRatio);
- } else {
- PushButton pushButton = (PushButton)getComponent();
- Button.DataRenderer dataRenderer = pushButton.getDataRenderer();
+ PushButton pushButton = (PushButton)getComponent();
+ Button.DataRenderer dataRenderer = pushButton.getDataRenderer();
+
+ dataRenderer.render(pushButton.getButtonData(), pushButton, false);
- dataRenderer.render(pushButton.getButtonData(), pushButton, false);
+ // Include padding in constraint
+ int contentWidth = width;
+ if (contentWidth != -1) {
+ contentWidth = Math.max(contentWidth - (padding.left + padding.right + 2), 0);
+ }
- // Include padding in constraint
- int contentWidth = width;
- if (contentWidth != -1) {
- contentWidth = Math.max(contentWidth - (padding.left + padding.right + 2), 0);
- }
+ preferredHeight = dataRenderer.getPreferredHeight(contentWidth)
+ + padding.top + padding.bottom + 2;
- preferredHeight = dataRenderer.getPreferredHeight(contentWidth)
- + padding.top + padding.bottom + 2;
+ // Adjust for preferred aspect ratio
+ if (!Float.isNaN(minimumPreferredAspectRatio)
+ && (float)width / (float)preferredHeight < minimumPreferredAspectRatio) {
+ preferredHeight = (int)(width / minimumPreferredAspectRatio);
}
}
@@ -151,11 +154,9 @@
+ padding.top + padding.bottom + 2;
// Adjust for preferred aspect ratio
- if (!Float.isNaN(preferredAspectRatio)) {
- if (preferredAspectRatio > 1) {
- preferredWidth = (int)(preferredHeight * preferredAspectRatio);
- } else {
- preferredHeight = (int)(preferredWidth / preferredAspectRatio);
+ if (!Float.isNaN(minimumPreferredAspectRatio)) {
+ if ((float)preferredWidth / (float)preferredHeight < minimumPreferredAspectRatio) {
+ preferredWidth = (int)(preferredHeight * minimumPreferredAspectRatio);
}
}
@@ -470,21 +471,21 @@
setPadding(Insets.decode(padding));
}
- public float getPreferredAspectRatio() {
- return preferredAspectRatio;
+ public float getMinimumPreferredAspectRatio() {
+ return minimumPreferredAspectRatio;
}
- public void setPreferredAspectRatio(float preferredAspectRatio) {
- this.preferredAspectRatio = preferredAspectRatio;
+ public void setMinimumPreferredAspectRatio(float minimumPreferredAspectRatio) {
+ this.minimumPreferredAspectRatio = minimumPreferredAspectRatio;
invalidateComponent();
}
- public final void setPreferredAspectRatio(Number preferredAspectRatio) {
- if (preferredAspectRatio == null) {
- throw new IllegalArgumentException("preferredAspectRatio is null.");
+ public final void setMinimumPreferredAspectRatio(Number minimumPreferredAspectRatio) {
+ if (minimumPreferredAspectRatio == null) {
+ throw new IllegalArgumentException("minimumPreferredAspectRatio is null.");
}
- setPreferredAspectRatio(preferredAspectRatio.floatValue());
+ setMinimumPreferredAspectRatio(minimumPreferredAspectRatio.floatValue());
}
public boolean isToolbar() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PushButtonTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PushButtonTest.java?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PushButtonTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PushButtonTest.java Fri Aug 7 04:33:06 2009
@@ -35,7 +35,7 @@
boxPane.getStyles().put("horizontalAlignment", HorizontalAlignment.RIGHT);
PushButton uploadButton = new PushButton("Upload");
- uploadButton.getStyles().put("preferredAspectRatio", 3.0f);
+ uploadButton.getStyles().put("minimumPreferredAspectRatio", 3.0f);
boxPane.add(uploadButton);
window.setContent(boxPane);
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SheetTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SheetTest.java?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SheetTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SheetTest.java Fri Aug 7 04:33:06 2009
@@ -87,7 +87,7 @@
boxPane.getStyles().put("horizontalAlignment", HorizontalAlignment.RIGHT);
final PushButton closeButton = new PushButton("Close");
- closeButton.getStyles().put("preferredAspectRatio", 3);
+ closeButton.getStyles().put("minimumPreferredAspectRatio", 3);
boxPane.add(closeButton);
sheet = new Sheet(tablePane);
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/flow_pane_test.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/flow_pane_test.wtkx?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/flow_pane_test.wtkx (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/flow_pane_test.wtkx Fri Aug 7 04:33:06 2009
@@ -22,23 +22,23 @@
xmlns="org.apache.pivot.wtk">
<content>
<FlowPane styles="{alignment:'left', backgroundColor:'#ff0000', padding:4}">
- <PushButton buttonData="0" styles="{preferredAspectRatio:15}"/>
- <PushButton buttonData="1" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="2" displayable="false" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="3" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="4" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="5" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="6" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="7" preferredHeight="40" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="8" preferredHeight="50" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="9" preferredHeight="60" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="0" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="A" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="B" displayable="false" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="C" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="D" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="E" styles="{preferredAspectRatio:1.5}"/>
- <PushButton buttonData="F" styles="{preferredAspectRatio:1.5}"/>
+ <PushButton buttonData="0" styles="{minimumPreferredAspectRatio:15}"/>
+ <PushButton buttonData="1" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="2" displayable="false" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="3" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="4" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="5" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="6" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="7" preferredHeight="40" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="8" preferredHeight="50" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="9" preferredHeight="60" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="0" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="A" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="B" displayable="false" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="C" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="D" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="E" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="F" styles="{minimumPreferredAspectRatio:1.5}"/>
</FlowPane>
</content>
</Frame>
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/preferred_aspect_ratio_test.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/preferred_aspect_ratio_test.wtkx?rev=801880&r1=801879&r2=801880&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/preferred_aspect_ratio_test.wtkx (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/preferred_aspect_ratio_test.wtkx Fri Aug 7 04:33:06 2009
@@ -22,9 +22,9 @@
<content>
<BoxPane styles="{fill:true}">
<BoxPane orientation="vertical" styles="{fill:true}">
- <PushButton buttonData="ABCDEFG" styles="{preferredAspectRatio:1}"/>
- <PushButton buttonData="ABC" styles="{preferredAspectRatio:1}"/>
- <PushButton buttonData="A" styles="{preferredAspectRatio:1}"/>
+ <PushButton buttonData="ABCDEFG" styles="{minimumPreferredAspectRatio:1}"/>
+ <PushButton buttonData="ABC" styles="{minimumPreferredAspectRatio:1}"/>
+ <PushButton buttonData="A" styles="{minimumPreferredAspectRatio:0.5}"/>
</BoxPane>
</BoxPane>
</content>