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 2012/02/08 17:18:42 UTC
svn commit: r1241959 -
/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
Author: smartini
Date: Wed Feb 8 16:18:42 2012
New Revision: 1241959
URL: http://svn.apache.org/viewvc?rev=1241959&view=rev
Log:
PIVOT-837, apply patch from Lukas
Modified:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java?rev=1241959&r1=1241958&r2=1241959&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java Wed Feb 8 16:18:42 2012
@@ -898,7 +898,7 @@ public class TerraTabPaneSkin extends Co
buttonPanoramaWidth = Math.max(width - 2 - cornerWidth, 0);
}
int cornerHeight = Math.max(corner.getPreferredHeight(-1), buttonPanoramaSize.height - 1);
- int cornerX = width - cornerWidth;
+ int cornerX = Math.min(buttonPanoramaWidth, width - cornerWidth);
int cornerY = Math.max(buttonPanoramaHeight - cornerHeight - 1, 0);
buttonPanoramaY = Math.max(cornerHeight - buttonPanoramaHeight + 1, 0);
@@ -936,7 +936,7 @@ public class TerraTabPaneSkin extends Co
}
int cornerWidth = Math.max(corner.getPreferredWidth(-1), buttonPanoramaSize.width - 1);
int cornerX = Math.max(buttonPanoramaWidth - cornerWidth - 1, 0);
- int cornerY = height - cornerHeight;
+ int cornerY = Math.min(buttonPanoramaHeight, height - cornerHeight);
buttonPanoramaX = Math.max(cornerWidth - buttonPanoramaWidth + 1, 0);