external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of submenus

Browse Source
This commit is contained in:
drdev
2014-04-12 05:52:50 +00:00
parent 3bbf98b4d4
commit 2bba9c9d8d
3 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-gui-mobile/src/forge/menu/FDropDown.java
View File

@@ -57,6 +57,7 @@ public abstract class FDropDown extends FScrollPane {
return true;
}
@Override
public void setVisible(boolean visible0) {
if (this.isVisible() == visible0) { return; }
@@ -144,12 +145,13 @@ public abstract class FDropDown extends FScrollPane {
@Override
public boolean tap(float x, float y, int count) {
FDisplayObject owner = getDropDownOwner();
if (owner != null && owner.contains(owner.getLeft() + owner.screenToLocalX(x), owner.getTop() + owner.screenToLocalY(y))) {
hide(); //auto-hide when owner tapped
return true; //prevent owner handling this tap
hide(); //always hide if tapped
//prevent owner handling this tap unless it's a sub menu
if (getDropDownOwner() instanceof FSubMenu) {
return false;
}
return false;
return true;
}
@Override

3
forge-gui-mobile/src/forge/menu/FDropDownMenu.java
View File

@@ -64,6 +64,9 @@ public abstract class FDropDownMenu extends FDropDown {
@Override
public boolean tap(float x, float y, int count) {
hide(); //hide when item tapped
if (getDropDownOwner() instanceof FSubMenu) {
return false; //return false so owning sub menu can be hidden
}
return true;
}
}

37
forge-gui-mobile/src/forge/menu/FSubMenu.java
View File

@@ -1,25 +1,32 @@
package forge.menu;
import forge.assets.FImage;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
public class FSubMenu extends FMenuItem {
public FSubMenu(String text0, FPopupMenu popupMenu) {
this(text0, null, popupMenu, true);
FPopupMenu popupMenu;
public FSubMenu(String text0, FPopupMenu popupMenu0) {
this(text0, null, popupMenu0, true);
}
public FSubMenu(String text0, FPopupMenu popupMenu, boolean enabled0) {
this(text0, null, popupMenu, enabled0);
public FSubMenu(String text0, FPopupMenu popupMenu0, boolean enabled0) {
this(text0, null, popupMenu0, enabled0);
}
public FSubMenu(String text0, FImage icon0, final FPopupMenu popupMenu) {
this(text0, icon0, popupMenu, true);
public FSubMenu(String text0, FImage icon0, final FPopupMenu popupMenu0) {
this(text0, icon0, popupMenu0, true);
}
public FSubMenu(String text0, FImage icon0, final FPopupMenu popupMenu, boolean enabled0) {
super(text0, icon0, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
popupMenu.show(e.getSource(), e.getSource().getWidth(), 0);
}
}, enabled0);
public FSubMenu(String text0, FImage icon0, final FPopupMenu popupMenu0, boolean enabled0) {
super(text0, icon0, null, enabled0);
popupMenu = popupMenu0;
}
@Override
public boolean tap(float x, float y, int count) {
if (popupMenu.isVisible()) {
popupMenu.hide();
}
else {
popupMenu.show(this, getWidth(), 0);
}
return true;
}
}