You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2016/08/16 17:21:21 UTC
svn commit: r1756535 - in /pivot/branches/2.0.x: ./
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
Author: rwhitcomb
Date: Tue Aug 16 17:21:21 2016
New Revision: 1756535
URL: http://svn.apache.org/viewvc?rev=1756535&view=rev
Log:
PIVOT-990: Fix the RepositionCallback logic in TerraMenuPopupSkin so that
a menu whose width or height is greater than the display width or height
will be positioned at 0 (X or Y as appropriate, or both), and whose
containing Border will be sized to the limiting display dimension. This
allows the contained Panorama to automatically insert scroll arrows so
the menu that has overflowed can be scrolled into view.
This is a merge of revision 1756534 from "trunk" to "branches/2.0.x".
Modified:
pivot/branches/2.0.x/ (props changed)
pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
Propchange: pivot/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 16 17:21:21 2016
@@ -1 +1 @@
-/pivot/trunk:1346574,1347051,1394847,1394858,1398511,1399331,1401781,1405882,1407585,1409081,1410536,1410555,1417081,1417258,1428056,1428650,1435351,1436707,1438126,1438659,1444260,1444910,1502657,1510821,1516518,1519859,1522078,1523205,1523736,1523776,1525982,1526005,1536829,1537222,1604238,1610563,1611829,1614462,1624381,1675204,1675517,1678238,1678251,1687873-1687874,1688306,1688484,1688523,1691618,1712175,1717360,1727931,1728247,1729480,1729493,1730100,1730108,1735181,1735282,1740570,1747445,1750549
+/pivot/trunk:1346574,1347051,1394847,1394858,1398511,1399331,1401781,1405882,1407585,1409081,1410536,1410555,1417081,1417258,1428056,1428650,1435351,1436707,1438126,1438659,1444260,1444910,1502657,1510821,1516518,1519859,1522078,1523205,1523736,1523776,1525982,1526005,1536829,1537222,1604238,1610563,1611829,1614462,1624381,1675204,1675517,1678238,1678251,1687873-1687874,1688306,1688484,1688523,1691618,1712175,1717360,1727931,1728247,1729480,1729493,1730100,1730108,1735181,1735282,1740570,1747445,1750549,1756534
Modified: pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java?rev=1756535&r1=1756534&r2=1756535&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java (original)
+++ pivot/branches/2.0.x/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraMenuPopupSkin.java Tue Aug 16 17:21:21 2016
@@ -58,12 +58,20 @@ public class TerraMenuPopupSkin extends
Dimensions size = menuPopup.getSize();
int x = location.x;
- if (x + size.width > display.getWidth()) {
+ int displayWidth = display.getWidth();
+ if (size.width > displayWidth) {
+ border.setPreferredWidth(displayWidth);
+ x = 0;
+ } else if (x + size.width > displayWidth) {
x -= size.width;
}
int y = location.y;
- if (y + size.height > display.getHeight()) {
+ int displayHeight = display.getHeight();
+ if (size.height > displayHeight) {
+ border.setPreferredHeight(displayHeight);
+ y = 0;
+ } else if (y + size.height > displayHeight) {
y-= size.height;
}