v3.3.0: adjusted ScrollPane to use PointerArea's onClick logic
This commit is contained in:
@@ -180,19 +180,19 @@ public class ScrollPane extends Component {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onPointerUp( PointerEvent event ) {
|
protected void onPointerUp( PointerEvent event ) {
|
||||||
if (dragging) {
|
if (event == curEvent && dragging) {
|
||||||
|
|
||||||
dragging = false;
|
dragging = false;
|
||||||
thumb.am = THUMB_ALPHA;
|
thumb.am = THUMB_ALPHA;
|
||||||
|
curEvent = null; //cancel here so onClick is skipped
|
||||||
} else {
|
|
||||||
|
|
||||||
PointF p = content.camera.screenToCamera( (int) event.current.x, (int) event.current.y );
|
|
||||||
ScrollPane.this.onClick( p.x, p.y );
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onClick(PointerEvent event) {
|
||||||
|
PointF p = content.camera.screenToCamera((int) event.current.x, (int) event.current.y);
|
||||||
|
ScrollPane.this.onClick(p.x, p.y);
|
||||||
|
}
|
||||||
|
|
||||||
private boolean dragging = false;
|
private boolean dragging = false;
|
||||||
private PointF lastPos = new PointF();
|
private PointF lastPos = new PointF();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user