v0.8.0: fixed crashes involving ghouls, and scroll areas not deactivating

2020-02-04 14:58:53 -05:00
parent b36db88c8c
commit 83def4a4b3
2 changed files with 14 additions and 3 deletions
--- a/SPD-classes/src/main/java/com/watabou/noosa/ScrollArea.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/ScrollArea.java
@@ -40,7 +40,14 @@ public class ScrollArea extends PointerArea {
 	private Signal.Listener<ScrollEvent> scrollListener = new Signal.Listener<ScrollEvent>() {
 		@Override
 		public boolean onSignal(ScrollEvent event) {
-			if (event != null && target.overlapsScreenPoint( (int)event.pos.x, (int)event.pos.y )){
+
+			boolean hit = event != null && target.overlapsScreenPoint( (int)event.pos.x, (int)event.pos.y );
+
+			if (!isActive()) {
+				return (hit && blockWhenInactive);
+			}
+
+			if (hit){
 				onScroll( event );
 				return true;
 			}