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

Merge branch 'master' into 'master'

Browse Source 
[Mobile] Fix dropdown for Android

See merge request core-developers/forge!6203
This commit is contained in:
Anthony Calosa
2022-02-10 07:07:16 +00:00
parent a25a2e548b ec534fc13b
commit 1eafc656bd
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors; import forge.assets.FSkinColor.Colors;
import forge.assets.FSkinTexture; import forge.assets.FSkinTexture;
import forge.gui.GuiBase;
import forge.screens.FScreen; import forge.screens.FScreen;
import forge.toolbox.FContainer; import forge.toolbox.FContainer;
import forge.toolbox.FDisplayObject; import forge.toolbox.FDisplayObject;
@@ -221,19 +222,22 @@ public abstract class FDropDown extends FScrollPane {
@Override @Override
public boolean pan(float x, float y, float deltaX, float deltaY, boolean moreVertical) { public boolean pan(float x, float y, float deltaX, float deltaY, boolean moreVertical) {
hide(); //always hide if backdrop panned if (!GuiBase.isAndroid())
hide(); //always hide if backdrop panned
return false; //allow pan to pass through to object behind backdrop return false; //allow pan to pass through to object behind backdrop
} }
@Override @Override
public boolean fling(float velocityX, float velocityY) { public boolean fling(float velocityX, float velocityY) {
hide(); //always hide if backdrop flung if (!GuiBase.isAndroid())
hide(); //always hide if backdrop flung
return false; //allow fling to pass through to object behind backdrop return false; //allow fling to pass through to object behind backdrop
} }
@Override @Override
public boolean zoom(float x, float y, float amount) { public boolean zoom(float x, float y, float amount) {
hide(); //always hide if backdrop zoomed if (!GuiBase.isAndroid())
hide(); //always hide if backdrop zoomed
return false; //allow zoom to pass through to object behind backdrop return false; //allow zoom to pass through to object behind backdrop
} }