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 2010/01/23 19:58:47 UTC
svn commit: r902461 - in /pivot/trunk/wtk/src/org/apache/pivot/wtk:
Component.java skin/ComponentSkin.java
Author: gbrown
Date: Sat Jan 23 18:58:46 2010
New Revision: 902461
URL: http://svn.apache.org/viewvc?rev=902461&view=rev
Log:
Move baseline calculation optimization from ComponentSkin to Component.
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java?rev=902461&r1=902460&r2=902461&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java Sat Jan 23 18:58:46 2010
@@ -584,6 +584,9 @@
// Calculated preferred size value
private Dimensions preferredSize = null;
+ // Calculated baseline for current size
+ private int baseline = -1;
+
// The component's parent container, or null if the component does not have
// a parent
private Container parent = null;
@@ -1448,7 +1451,11 @@
*/
@Override
public int getBaseline() {
- return skin.getBaseline();
+ if (baseline == -1) {
+ baseline = skin.getBaseline();
+ }
+
+ return baseline;
}
/**
@@ -1883,8 +1890,9 @@
public void invalidate() {
valid = false;
- // Clear the preferred size
+ // Clear the preferred size and baseline
preferredSize = null;
+ baseline = -1;
if (parent != null) {
parent.invalidate();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java?rev=902461&r1=902460&r2=902461&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ComponentSkin.java Sat Jan 23 18:58:46 2010
@@ -82,7 +82,6 @@
private int width = 0;
private int height = 0;
- private int baseline = -1;
private ShowTooltipCallback showTooltipCallback = new ShowTooltipCallback();
private ApplicationContext.ScheduledCallback scheduledShowTooltipCallback = null;
@@ -103,8 +102,6 @@
public void setSize(int width, int height) {
this.width = width;
this.height = height;
-
- baseline = -1;
}
@Override
@@ -114,11 +111,7 @@
@Override
public final int getBaseline() {
- if (baseline == -1) {
- baseline = getBaseline(width, height);
- }
-
- return baseline;
+ return getBaseline(width, height);
}
@Override