You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/09/24 00:56:55 UTC
svn commit: r818304 -
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
Author: tvolkert
Date: Wed Sep 23 22:56:55 2009
New Revision: 818304
URL: http://svn.apache.org/viewvc?rev=818304&view=rev
Log:
Fixed PIVOT-298
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java?rev=818304&r1=818303&r2=818304&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraAccordionSkin.java Wed Sep 23 22:56:55 2009
@@ -403,7 +403,7 @@
maxPanelHeight = Math.max(maxPanelHeight, panel.getPreferredHeight(width));
}
- preferredHeight += (maxPanelHeight + padding.top + padding.bottom);
+ preferredHeight += (maxPanelHeight + padding.top + padding.bottom + 2);
return preferredHeight;
}
@@ -433,7 +433,7 @@
int preferredWidth = Math.max(maxPanelHeaderWidth, maxPanelWidth
+ (padding.left + padding.right + 2));
- preferredHeight += (maxPanelHeight + padding.top + padding.bottom);
+ preferredHeight += (maxPanelHeight + padding.top + padding.bottom + 2);
return new Dimensions(preferredWidth, preferredHeight);
}
@@ -458,7 +458,7 @@
panelHeight -= (panelHeader.getHeight() - 1);
}
- panelHeight = Math.max(panelHeight - 1, 0);
+ panelHeight = Math.max(panelHeight - 2, 0);
contentHeight = Math.max(panelHeight - (padding.top + padding.bottom), 0);
} else {
panelHeight = selectionChangeTransition.toPanel.getHeight()
@@ -483,27 +483,27 @@
panel.setVisible(true);
panel.setSize(contentWidth, contentHeight);
- panel.setLocation(padding.left + 1, panelY + padding.top);
+ panel.setLocation(padding.left + 1, panelY + padding.top + 1);
- panelY += panelHeight;
+ panelY += panelHeight + 1;
} else {
panel.setVisible(false);
}
} else {
if (selectionChangeTransition.isRunning()) {
if (panel == selectionChangeTransition.fromPanel) {
- panel.setLocation(padding.left + 1, panelY + padding.top);
+ panel.setLocation(padding.left + 1, panelY + padding.top + 1);
int previousSelectedPanelHeight = Math.round(panelHeight * (1.0f
- selectionChangeTransition.getEasedPercentComplete()));
previousSelectedPanelClipDecorator.setWidth(contentWidth);
previousSelectedPanelClipDecorator.setHeight(previousSelectedPanelHeight);
- panelY += previousSelectedPanelHeight;
+ panelY += previousSelectedPanelHeight + 1;
}
if (panel == selectionChangeTransition.toPanel) {
- panel.setLocation(padding.left + 1, panelY + padding.top);
+ panel.setLocation(padding.left + 1, panelY + padding.top + 1);
int selectedPanelHeight = Math.round(panelHeight
* selectionChangeTransition.getEasedPercentComplete());