mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 705246 - Disable overscroll when panning. r=kats
This commit is contained in:
parent
272b9ced11
commit
0bc39cb1db
@ -2555,6 +2555,7 @@ abstract public class GeckoApp
|
|||||||
|
|
||||||
protected void geckoConnected() {
|
protected void geckoConnected() {
|
||||||
mLayerView.geckoConnected();
|
mLayerView.geckoConnected();
|
||||||
|
mLayerView.setOverScrollMode(View.OVER_SCROLL_NEVER);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAccessibilityEnabled(boolean enabled) {
|
public void setAccessibilityEnabled(boolean enabled) {
|
||||||
|
@ -218,10 +218,4 @@ public class WebAppImpl extends GeckoApp {
|
|||||||
}
|
}
|
||||||
super.onTabChanged(tab, msg, data);
|
super.onTabChanged(tab, msg, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void geckoConnected() {
|
|
||||||
super.geckoConnected();
|
|
||||||
mLayerView.setOverScrollMode(View.OVER_SCROLL_NEVER);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
@ -144,6 +144,8 @@ abstract class Axis {
|
|||||||
protected abstract float getViewportLength();
|
protected abstract float getViewportLength();
|
||||||
protected abstract float getPageStart();
|
protected abstract float getPageStart();
|
||||||
protected abstract float getPageLength();
|
protected abstract float getPageLength();
|
||||||
|
protected abstract float getMarginStart();
|
||||||
|
protected abstract float getMarginEnd();
|
||||||
protected abstract boolean marginsHidden();
|
protected abstract boolean marginsHidden();
|
||||||
|
|
||||||
Axis(SubdocumentScrollHelper subscroller) {
|
Axis(SubdocumentScrollHelper subscroller) {
|
||||||
@ -377,11 +379,11 @@ abstract class Axis {
|
|||||||
// getOverscroll which doesn't take into account any new displacment being applied.
|
// getOverscroll which doesn't take into account any new displacment being applied.
|
||||||
// If we using a subscroller, we don't want to alter the scrolling being done
|
// If we using a subscroller, we don't want to alter the scrolling being done
|
||||||
if (getOverScrollMode() == View.OVER_SCROLL_NEVER && !mSubscroller.scrolling()) {
|
if (getOverScrollMode() == View.OVER_SCROLL_NEVER && !mSubscroller.scrolling()) {
|
||||||
if (mDisplacement + getOrigin() < getPageStart()) {
|
if (mDisplacement + getOrigin() < getPageStart() - getMarginStart()) {
|
||||||
mDisplacement = getPageStart() - getOrigin();
|
mDisplacement = getPageStart() - getMarginStart() - getOrigin();
|
||||||
stopFling();
|
stopFling();
|
||||||
} else if (mDisplacement + getViewportEnd() > getPageEnd()) {
|
} else if (mDisplacement + getViewportEnd() > getPageEnd() + getMarginEnd()) {
|
||||||
mDisplacement = getPageEnd() - getViewportEnd();
|
mDisplacement = getPageEnd() - getMarginEnd() - getViewportEnd();
|
||||||
stopFling();
|
stopFling();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1102,6 +1102,10 @@ class JavaPanZoomController
|
|||||||
@Override
|
@Override
|
||||||
protected float getPageStart() { return getMetrics().pageRectLeft; }
|
protected float getPageStart() { return getMetrics().pageRectLeft; }
|
||||||
@Override
|
@Override
|
||||||
|
protected float getMarginStart() { return mTarget.getMaxMargins().left - getMetrics().marginLeft; }
|
||||||
|
@Override
|
||||||
|
protected float getMarginEnd() { return mTarget.getMaxMargins().right - getMetrics().marginRight; }
|
||||||
|
@Override
|
||||||
protected float getPageLength() { return getMetrics().getPageWidthWithMargins(); }
|
protected float getPageLength() { return getMetrics().getPageWidthWithMargins(); }
|
||||||
@Override
|
@Override
|
||||||
protected boolean marginsHidden() {
|
protected boolean marginsHidden() {
|
||||||
@ -1122,6 +1126,10 @@ class JavaPanZoomController
|
|||||||
@Override
|
@Override
|
||||||
protected float getPageLength() { return getMetrics().getPageHeightWithMargins(); }
|
protected float getPageLength() { return getMetrics().getPageHeightWithMargins(); }
|
||||||
@Override
|
@Override
|
||||||
|
protected float getMarginStart() { return mTarget.getMaxMargins().top - getMetrics().marginTop; }
|
||||||
|
@Override
|
||||||
|
protected float getMarginEnd() { return mTarget.getMaxMargins().bottom - getMetrics().marginBottom; }
|
||||||
|
@Override
|
||||||
protected boolean marginsHidden() {
|
protected boolean marginsHidden() {
|
||||||
ImmutableViewportMetrics metrics = getMetrics();
|
ImmutableViewportMetrics metrics = getMetrics();
|
||||||
RectF maxMargins = mTarget.getMaxMargins();
|
RectF maxMargins = mTarget.getMaxMargins();
|
||||||
|
Loading…
Reference in New Issue
Block a user