You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2013/03/07 12:36:32 UTC
svn commit: r1453782 - in /pivot/branches/2.0.x:
examples/src/org/apache/pivot/examples/svg/svg_example.bxml
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
Author: smartini
Date: Thu Mar 7 11:36:32 2013
New Revision: 1453782
URL: http://svn.apache.org/r1453782
Log:
PIVOT-898 (but after the fix) , refactor some common (repeated) calculations in private methods, to start implementing the DRY principle even in some cases ... future work: maybe do even in other classes, and cache calculated values when set base values
Modified:
pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/svg/svg_example.bxml
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
Modified: pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/svg/svg_example.bxml
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/svg/svg_example.bxml?rev=1453782&r1=1453781&r2=1453782&view=diff
==============================================================================
--- pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/svg/svg_example.bxml (original)
+++ pivot/branches/2.0.x/examples/src/org/apache/pivot/examples/svg/svg_example.bxml Thu Mar 7 11:36:32 2013
@@ -43,7 +43,7 @@ limitations under the License.
</dataRenderer>
<buttonData>
- <content:ButtonData icon="@logo-64x64.png" text="Say Hello to PNG"/>
+ <content:ButtonData icon="@logo-64x64.png" text="Say Hello"/>
</buttonData>
<buttonPressListeners>
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java?rev=1453782&r1=1453781&r2=1453782&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPushButtonSkin.java Thu Mar 7 11:36:32 2013
@@ -93,11 +93,11 @@ public class TerraPushButtonSkin extends
// Include padding in constraint
int contentHeight = height;
if (contentHeight != -1) {
- contentHeight = Math.max(contentHeight - (padding.top + padding.bottom + 2), 0);
+ contentHeight = Math.max(contentHeight - paddingHeight(), 0);
}
preferredWidth = dataRenderer.getPreferredWidth(contentHeight)
- + padding.left + padding.right + 2;
+ + paddingWitdh();
// Adjust for preferred aspect ratio
if (!Float.isNaN(minimumAspectRatio)
@@ -124,11 +124,11 @@ public class TerraPushButtonSkin extends
// Include padding in constraint
int contentWidth = width;
if (contentWidth != -1) {
- contentWidth = Math.max(contentWidth - (padding.left + padding.right + 2), 0);
+ contentWidth = Math.max(contentWidth - paddingWitdh(), 0);
}
preferredHeight = dataRenderer.getPreferredHeight(contentWidth)
- + padding.top + padding.bottom + 2;
+ + paddingHeight();
// Adjust for preferred aspect ratio
if (!Float.isNaN(maximumAspectRatio)
@@ -148,12 +148,8 @@ public class TerraPushButtonSkin extends
dataRenderer.render(pushButton.getButtonData(), pushButton, false);
Dimensions preferredContentSize = dataRenderer.getPreferredSize();
-
- int preferredWidth = preferredContentSize.width
- + padding.left + padding.right + 2;
-
- int preferredHeight = preferredContentSize.height
- + padding.top + padding.bottom + 2;
+ int preferredWidth = preferredContentSize.width + paddingWitdh();
+ int preferredHeight = preferredContentSize.height + paddingHeight();
// Adjust for preferred aspect ratio
float aspectRatio = (float) preferredWidth / (float) preferredHeight;
@@ -178,11 +174,10 @@ public class TerraPushButtonSkin extends
Button.DataRenderer dataRenderer = pushButton.getDataRenderer();
dataRenderer.render(pushButton.getButtonData(), pushButton, false);
- int clientWidth = Math.max(width - (padding.left + padding.right + 2), 0);
- int clientHeight = Math.max(height - (padding.top + padding.bottom + 2), 0);
+ int clientWidth = Math.max(width - paddingWitdh(), 0);
+ int clientHeight = Math.max(height - paddingHeight(), 0);
int baseline = dataRenderer.getBaseline(clientWidth, clientHeight);
-
if (baseline != -1) {
baseline += padding.top + 1;
}
@@ -234,8 +229,10 @@ public class TerraPushButtonSkin extends
Button.DataRenderer dataRenderer = pushButton.getDataRenderer();
dataRenderer.render(pushButton.getButtonData(), pushButton, highlighted);
- dataRenderer.setSize(Math.max(width - (padding.left + padding.right + 2), 0),
- Math.max(getHeight() - (padding.top + padding.bottom + 2), 0));
+ dataRenderer.setSize(
+ Math.max(width - paddingWitdh(), 0),
+ Math.max(getHeight() - paddingHeight(), 0)
+ );
Graphics2D contentGraphics = (Graphics2D) graphics.create();
contentGraphics.translate(padding.left + 1, padding.top + 1);
@@ -508,6 +505,14 @@ public class TerraPushButtonSkin extends
setPadding(Insets.decode(padding));
}
+ private int paddingWitdh() {
+ return padding.left + padding.right + 2;
+ }
+
+ private int paddingHeight() {
+ return padding.top + padding.bottom + 2;
+ }
+
public float getMinimumAspectRatio() {
return minimumAspectRatio;
}
@@ -585,4 +590,5 @@ public class TerraPushButtonSkin extends
return super.mouseClick(component, button, x, y, count);
}
+
}