Improve submenu postion choosing, close #220

kotcrab · Oct 3, 2016 · faa6765 · faa6765
1 parent 8d2c754
commit faa6765
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/ui/CHANGES.md b/ui/CHANGES.md
@@ -1,5 +1,6 @@
 #### Version: 1.2.4-SNAPSHOT (LibGDX 1.9.4)
 - **Fixed**: `Spinner.TextFieldEventPolicy` is now public (was package-private)
+- **Improved**: [#220](https://github.com/kotcrab/vis-editor/issues/220) when sub menu can't fit on the right side of parent menu, it will be shown on the side that has more available space (before in such case it was always shown on the left side)
 
 #### Version: 1.2.3 (LibGDX 1.9.4)
 - **Added**: constructor `LinkLabel (CharSequence text, CharSequence url, LinkLabelStyle style)`

diff --git a/ui/src/main/java/com/kotcrab/vis/ui/widget/MenuItem.java b/ui/src/main/java/com/kotcrab/vis/ui/widget/MenuItem.java
@@ -196,12 +196,16 @@ void showSubMenu () {
 		Stage stage = getStage();
 		Vector2 pos = localToStageCoordinates(tmpVector.setZero());
 
+		float availableSpaceLeft = pos.x;
+		float availableSpaceRight = stage.getWidth() - (pos.x + getWidth());
+		boolean canFitOnTheRight = pos.x + getWidth() + subMenu.getWidth() <= stage.getWidth();
 		float subMenuX;
-		if (pos.x + getWidth() + subMenu.getWidth() >= stage.getWidth()) { //if won't fit on screen
-			subMenuX = pos.x - subMenu.getWidth() + 1;
-		} else {
+		if (canFitOnTheRight || availableSpaceRight > availableSpaceLeft) {
 			subMenuX = pos.x + getWidth() - 1;
+		} else {
+			subMenuX = pos.x - subMenu.getWidth() + 1;
 		}
+
 		subMenu.setPosition(subMenuX, pos.y - subMenu.getHeight() + getHeight());
 
 		if (subMenu.getY() < 0) {