konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.9.2: improved logic for buttons inside of scroll areas

Browse Source
This commit is contained in:
Evan Debenham
2021-01-17 18:16:27 -05:00
parent 5be3fe7ba0
commit 412ea03892
6 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SPD-classes/src/main/java/com/watabou/noosa/PointerArea.java
View File

@@ -30,9 +30,11 @@ public class PointerArea extends Visual implements Signal.Listener<PointerEvent>
public Visual target;
protected PointerEvent curEvent = null;
//if true, this PointerArea will always block input, even when it is inactive
public boolean blockWhenInactive = false;
public int blockLevel = BLOCK_WHEN_ACTIVE;
public static final int ALWAYS_BLOCK = 0; //Always block input to overlapping elements
public static final int BLOCK_WHEN_ACTIVE = 1; //Only block when active (default)
public static final int NEVER_BLOCK = 2; //Never block (handy for buttons in scroll areas)
public PointerArea( Visual target ) {
super( 0, 0, 0, 0 );
@@ -56,7 +58,7 @@ public class PointerArea extends Visual implements Signal.Listener<PointerEvent>
boolean hit = event != null && target.overlapsScreenPoint( (int)event.current.x, (int)event.current.y );
if (!isActive()) {
return (hit && blockWhenInactive);
return (hit && blockLevel == ALWAYS_BLOCK);
}
if (hit) {
@@ -81,7 +83,7 @@ public class PointerArea extends Visual implements Signal.Listener<PointerEvent>
}
return returnValue;
return returnValue && blockLevel != NEVER_BLOCK;
} else {

2
SPD-classes/src/main/java/com/watabou/noosa/ScrollArea.java
View File

@@ -44,7 +44,7 @@ public class ScrollArea extends PointerArea {
boolean hit = event != null && target.overlapsScreenPoint( (int)event.pos.x, (int)event.pos.y );
if (!isActive()) {
return (hit && blockWhenInactive);
return (hit && blockLevel == ALWAYS_BLOCK);
}
if (hit){

1
SPD-classes/src/main/java/com/watabou/noosa/Visual.java
View File

@@ -261,6 +261,7 @@ public class Visual extends Gizmo {
Camera c = camera();
if (c == null) return false;
if (!c.hitTest(x, y)) return false;
PointF p = c.screenToCamera( x, y );
return overlapsPoint( p.x, p.y );