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/11 14:46:03 UTC
svn commit: r803091 - 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: Tue Aug 11 12:46:03 2009
New Revision: 803091
URL: http://svn.apache.org/viewvc?rev=803091&view=rev
Log:
Revert earlier change renaming preferredAspectRatio to minimumPreferredAspectRatio in TerraPushButtonSkin.
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/skin/BoxPaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.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/TerraMenuPopupSkin.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/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_sheet_skin.wtkx
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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 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="{minimumPreferredAspectRatio:3}"/>
+ enabled="false" styles="{preferredAspectRatio: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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 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="{minimumPreferredAspectRatio:3}"/>
- <PushButton wtkx:id="cancelButton" buttonData="Cancel" enabled="false" styles="{minimumPreferredAspectRatio:3}"/>
+ <PushButton wtkx:id="loadDataButton" buttonData="Load Data" styles="{preferredAspectRatio:3}"/>
+ <PushButton wtkx:id="cancelButton" buttonData="Cancel" enabled="false" styles="{preferredAspectRatio: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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -60,9 +60,9 @@
</TablePane.Row>
<TablePane.Row height="-1">
<BoxPane styles="{spacing:6,horizontalAlignment:'right'}">
- <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}"/>
+ <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}"/>
</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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -25,14 +25,14 @@
<Border styles="{padding:0}">
<content>
<FlowPane wtkx:id="flowPane">
- <PushButton buttonData="0" styles="{minimumPreferredAspectRatio:1.5}"/>
- <PushButton buttonData="1" styles="{minimumPreferredAspectRatio:1.5}"/>
- <PushButton buttonData="2" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="0" styles="{preferredAspectRatio:1.5}"/>
+ <PushButton buttonData="1" styles="{preferredAspectRatio:1.5}"/>
+ <PushButton buttonData="2" styles="{preferredAspectRatio: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="{minimumPreferredAspectRatio:1.5}"/>
- <PushButton buttonData="7" styles="{minimumPreferredAspectRatio:1.5}"/>
+ <PushButton buttonData="6" styles="{preferredAspectRatio:1.5}"/>
+ <PushButton buttonData="7" styles="{preferredAspectRatio: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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -81,7 +81,7 @@
</BoxPane>
<BoxPane styles="{horizontalAlignment:'right', verticalAlignment:'center'}">
<PushButton wtkx:id="submitButton" buttonData="Submit"
- styles="{minimumPreferredAspectRatio:3}"/>
+ styles="{preferredAspectRatio: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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -32,7 +32,7 @@
<BoxPane styles="{horizontalAlignment:'right', backgroundColor:11,
padding:4}">
<PushButton wtkx:id="nextButton" buttonData="Next"
- styles="{minimumPreferredAspectRatio:3}"/>
+ styles="{preferredAspectRatio: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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -32,7 +32,7 @@
<BoxPane styles="{horizontalAlignment:'right', backgroundColor:11,
padding:4}">
<PushButton wtkx:id="nextButton" buttonData="Next"
- styles="{minimumPreferredAspectRatio:3}"/>
+ styles="{preferredAspectRatio: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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -38,7 +38,7 @@
</BoxPane>
<BoxPane orientation="vertical"
styles="{horizontalAlignment:'center', spacing:12, padding:{top:12}}">
- <PushButton wtkx:id="confirmOrderButton" styles="{minimumPreferredAspectRatio:3}"/>
+ <PushButton wtkx:id="confirmOrderButton" styles="{preferredAspectRatio:3}"/>
<ActivityIndicator wtkx:id="activityIndicator" styles="{color:16}"
preferredWidth="48" preferredHeight="48"/>
<Label wtkx:id="processingOrderLabel" text="Pretending to process order..." visible="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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -41,7 +41,7 @@
</TablePane.Row>
<TablePane.Row height="-1">
<BoxPane styles="{horizontalAlignment:'center', padding:6}">
- <PushButton wtkx:id="activityButton" styles="{minimumPreferredAspectRatio:3}"/>
+ <PushButton wtkx:id="activityButton" styles="{preferredAspectRatio: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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -37,7 +37,7 @@
</TablePane.Row>
<TablePane.Row height="-1">
<BoxPane styles="{horizontalAlignment:'center', padding:6}">
- <PushButton wtkx:id="progressButton" styles="{minimumPreferredAspectRatio:3}"/>
+ <PushButton wtkx:id="progressButton" styles="{preferredAspectRatio:3}"/>
</BoxPane>
</TablePane.Row>
</rows>
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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -308,6 +308,7 @@
if (fill) {
componentWidth = Math.max(width - (padding.left
+ padding.right), 0);
+
componentHeight = component.getPreferredHeight(componentWidth);
} else {
Dimensions preferredComponentSize = component.getPreferredSize();
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java?rev=803091&r1=803090&r2=803091&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MenuBarItemSkin.java Tue Aug 11 12:46:03 2009
@@ -109,6 +109,11 @@
}
@Override
+ public boolean isFocusable() {
+ return false;
+ }
+
+ @Override
public void mouseOver(Component component) {
super.mouseOver(component);
@@ -199,38 +204,19 @@
menuPopup.close();
}
- @Override
- public void focusedChanged(Component component, Component obverseComponent) {
- super.focusedChanged(component, obverseComponent);
-
- if (component.isFocused()) {
- if (!menuPopup.isOpen()) {
- MenuBar.Item menuBarItem = (MenuBar.Item)component;
- Display display = menuBarItem.getDisplay();
- Point menuBarItemLocation = menuBarItem.mapPointToAncestor(display, 0, getHeight());
-
- // TODO Ensure that the popup remains within the bounds of the display
-
- menuPopup.setLocation(menuBarItemLocation.x, menuBarItemLocation.y);
- menuPopup.open(menuBarItem);
- }
+ public void buttonPressed(Button button) {
+ if (menuPopup.isOpen()) {
+ menuPopup.close();
} else {
- if (!menuPopup.containsFocus()) {
- menuPopup.close();
- }
- }
- }
+ MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
- public void buttonPressed(Button button) {
- MenuBar.Item menuBarItem = (MenuBar.Item)getComponent();
- MenuBar menuBar = menuBarItem.getMenuBar();
+ Display display = menuBarItem.getDisplay();
+ Point menuBarItemLocation = menuBarItem.mapPointToAncestor(display, 0, getHeight());
- if (menuPopup.isOpen()) {
- if (menuBar.isActive()) {
- Component.clearFocus();
- } else {
- menuBar.setActive(true);
- }
+ // TODO Ensure that the popup remains within the bounds of the display
+
+ menuPopup.setLocation(menuBarItemLocation.x, menuBarItemLocation.y);
+ menuPopup.open(menuBarItem);
}
}
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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -99,7 +99,7 @@
optionButtonStyles.put("borderColor", theme.getColor(13));
optionButton.setStyles(optionButtonStyles);
- optionButton.getStyles().put("minimumPreferredAspectRatio", 3);
+ optionButton.getStyles().put("preferredAspectRatio", 3);
optionButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java?rev=803091&r1=803090&r2=803091&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java Tue Aug 11 12:46:03 2009
@@ -193,12 +193,14 @@
if (keyCode == Keyboard.KeyCode.ESCAPE) {
MenuPopup menuPopup = (MenuPopup)getComponent();
+ menuPopup.close();
+
+ // TODO Maybe we should leave this to the caller
Component affiliate = menuPopup.getAffiliate();
- if (affiliate != null) {
+ if (affiliate != null
+ && affiliate.isFocusable()) {
affiliate.requestFocus();
}
-
- menuPopup.close();
}
return consumed;
@@ -236,10 +238,14 @@
super.windowClosed(window, display);
display.getContainerMouseListeners().remove(displayMouseListener);
-
Component.getComponentClassListeners().remove(this);
closeTransition = null;
+
+ // TODO Maybe we should leave this to the caller
+ MenuPopup menuPopup = (MenuPopup)getComponent();
+ Component affiliate = menuPopup.getAffiliate();
+ affiliate.getWindow().moveToFront();
}
public void menuChanged(MenuPopup menuPopup, Menu previousMenu) {
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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -97,7 +97,7 @@
optionButtonStyles.put("borderColor", theme.getColor(13));
optionButton.setStyles(optionButtonStyles);
- optionButton.getStyles().put("minimumPreferredAspectRatio", 3);
+ optionButton.getStyles().put("preferredAspectRatio", 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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -49,7 +49,7 @@
private Color borderColor;
private Color disabledBorderColor;
private Insets padding;
- private float minimumPreferredAspectRatio;
+ private float preferredAspectRatio;
private boolean toolbar;
// Derived colors
@@ -68,7 +68,7 @@
borderColor = theme.getColor(7);
disabledBorderColor = theme.getColor(7);
padding = new Insets(2, 3, 2, 3);
- minimumPreferredAspectRatio = Float.NaN;
+ preferredAspectRatio = Float.NaN;
toolbar = false;
// Set the derived colors
@@ -81,7 +81,7 @@
int preferredWidth = 0;
if (height == -1
- && !Float.isNaN(minimumPreferredAspectRatio)) {
+ && !Float.isNaN(preferredAspectRatio)) {
preferredWidth = getPreferredSize().width;
} else {
PushButton pushButton = (PushButton)getComponent();
@@ -99,9 +99,9 @@
+ padding.left + padding.right + 2;
// Adjust for preferred aspect ratio
- if (!Float.isNaN(minimumPreferredAspectRatio)
- && (float)preferredWidth / (float)height < minimumPreferredAspectRatio) {
- preferredWidth = (int)(height * minimumPreferredAspectRatio);
+ if (!Float.isNaN(preferredAspectRatio)
+ && (float)preferredWidth / (float)height < preferredAspectRatio) {
+ preferredWidth = (int)(height * preferredAspectRatio);
}
}
@@ -112,7 +112,7 @@
int preferredHeight = 0;
if (width== -1
- && !Float.isNaN(minimumPreferredAspectRatio)) {
+ && !Float.isNaN(preferredAspectRatio)) {
preferredHeight = getPreferredSize().height;
} else {
PushButton pushButton = (PushButton)getComponent();
@@ -130,9 +130,9 @@
+ padding.top + padding.bottom + 2;
// Adjust for preferred aspect ratio
- if (!Float.isNaN(minimumPreferredAspectRatio)
- && (float)width / (float)preferredHeight < minimumPreferredAspectRatio) {
- preferredHeight = (int)(width / minimumPreferredAspectRatio);
+ if (!Float.isNaN(preferredAspectRatio)
+ && (float)width / (float)preferredHeight > preferredAspectRatio) {
+ preferredHeight = (int)(width / preferredAspectRatio);
}
}
@@ -154,9 +154,14 @@
+ padding.top + padding.bottom + 2;
// Adjust for preferred aspect ratio
- if (!Float.isNaN(minimumPreferredAspectRatio)
- && (float)preferredWidth / (float)preferredHeight < minimumPreferredAspectRatio) {
- preferredWidth = (int)(preferredHeight * minimumPreferredAspectRatio);
+ if (!Float.isNaN(preferredAspectRatio)) {
+ float preferredAspectRatio = (float)preferredWidth / (float)preferredHeight;
+
+ if (preferredAspectRatio < this.preferredAspectRatio) {
+ preferredWidth = (int)(preferredHeight * preferredAspectRatio);
+ } else {
+ preferredHeight = (int)(preferredWidth / preferredAspectRatio);
+ }
}
return new Dimensions(preferredWidth, preferredHeight);
@@ -470,21 +475,21 @@
setPadding(Insets.decode(padding));
}
- public float getMinimumPreferredAspectRatio() {
- return minimumPreferredAspectRatio;
+ public float getPreferredAspectRatio() {
+ return preferredAspectRatio;
}
- public void setMinimumPreferredAspectRatio(float minimumPreferredAspectRatio) {
- this.minimumPreferredAspectRatio = minimumPreferredAspectRatio;
+ public void setPreferredAspectRatio(float preferredAspectRatio) {
+ this.preferredAspectRatio = preferredAspectRatio;
invalidateComponent();
}
- public final void setMinimumPreferredAspectRatio(Number minimumPreferredAspectRatio) {
- if (minimumPreferredAspectRatio == null) {
- throw new IllegalArgumentException("minimumPreferredAspectRatio is null.");
+ public final void setPreferredAspectRatio(Number preferredAspectRatio) {
+ if (preferredAspectRatio == null) {
+ throw new IllegalArgumentException("preferredAspectRatio is null.");
}
- setMinimumPreferredAspectRatio(minimumPreferredAspectRatio.floatValue());
+ setPreferredAspectRatio(preferredAspectRatio.floatValue());
}
public boolean isToolbar() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_sheet_skin.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_sheet_skin.wtkx?rev=803091&r1=803090&r2=803091&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_sheet_skin.wtkx (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_sheet_skin.wtkx Tue Aug 11 12:46:03 2009
@@ -42,9 +42,9 @@
<TablePane.Row height="-1">
<BoxPane styles="{horizontalAlignment:'right', verticalAlignment:'center'}">
<PushButton wtkx:id="okButton" buttonData="%ok"
- styles="{minimumPreferredAspectRatio:3}"/>
+ styles="{preferredAspectRatio:3}"/>
<PushButton wtkx:id="cancelButton" buttonData="%cancel"
- styles="{minimumPreferredAspectRatio:3}"/>
+ styles="{preferredAspectRatio:3}"/>
</BoxPane>
</TablePane.Row>
</rows>
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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -35,7 +35,7 @@
boxPane.getStyles().put("horizontalAlignment", HorizontalAlignment.RIGHT);
PushButton uploadButton = new PushButton("Upload");
- uploadButton.getStyles().put("minimumPreferredAspectRatio", 3.0f);
+ uploadButton.getStyles().put("preferredAspectRatio", 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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -87,7 +87,7 @@
boxPane.getStyles().put("horizontalAlignment", HorizontalAlignment.RIGHT);
final PushButton closeButton = new PushButton("Close");
- closeButton.getStyles().put("minimumPreferredAspectRatio", 3);
+ closeButton.getStyles().put("preferredAspectRatio", 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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -22,23 +22,23 @@
xmlns="org.apache.pivot.wtk">
<content>
<FlowPane styles="{alignment:'left', backgroundColor:'#ff0000', padding:4}">
- <PushButton buttonData="0" styles="{minimumPreferredAspectRatio:15}"/>
- <PushButton buttonData="1" styles="{minimumPreferredAspectRatio:1.5}"/>
- <PushButton buttonData="2" visible="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" visible="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}"/>
+ <PushButton buttonData="0" styles="{preferredAspectRatio:15}"/>
+ <PushButton buttonData="1" styles="{preferredAspectRatio:1.5}"/>
+ <PushButton buttonData="2" visible="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" visible="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}"/>
</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=803091&r1=803090&r2=803091&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 Tue Aug 11 12:46:03 2009
@@ -22,9 +22,9 @@
<content>
<BoxPane styles="{fill:true}">
<BoxPane orientation="vertical" styles="{fill:true}">
- <PushButton buttonData="ABCDEFG" styles="{minimumPreferredAspectRatio:1}"/>
- <PushButton buttonData="ABC" styles="{minimumPreferredAspectRatio:1}"/>
- <PushButton buttonData="A" styles="{minimumPreferredAspectRatio:0.5}"/>
+ <PushButton buttonData="ABCDEFG" styles="{preferredAspectRatio:1}"/>
+ <PushButton buttonData="ABC" styles="{preferredAspectRatio:1}"/>
+ <PushButton buttonData="A" styles="{preferredAspectRatio:1}"/>
</BoxPane>
</BoxPane>
</content>