Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: extra space to the image, allows to pan further from the sides (like PAN_LIMIT_CENTER but customizable). #424

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Feature: extra space to the image, allows to pan further from the sides (like PAN_LIMIT_CENTER but customizable). #424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 119 additions & 13 deletions library/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,12 @@ public class SubsamplingScaleImageView extends View {
private PointF vTranslateStart;
private PointF vTranslateBefore;

// Extra space that artificially increases size of an image
private float vExtraSpaceLeft;
private float vExtraSpaceTop;
private float vExtraSpaceRight;
private float vExtraSpaceBottom;

// Source coordinate to center on, used when new position is set externally before view is ready
private Float pendingScale;
private PointF sPendingCenter;
Expand Down Expand Up @@ -1420,15 +1426,21 @@ private void fitToBounds(boolean center, ScaleAndTranslate sat) {
float scaleWidth = scale * sWidth();
float scaleHeight = scale * sHeight();

boolean extra = panLimit == PAN_LIMIT_INSIDE;
float extraLeft = extra ? vExtraSpaceLeft : 0;
float extraRight = extra ? vExtraSpaceRight : 0;
float extraTop = extra ? vExtraSpaceTop : 0;
float extraBottom = extra ? vExtraSpaceBottom : 0;

if (panLimit == PAN_LIMIT_CENTER && isReady()) {
vTranslate.x = Math.max(vTranslate.x, getWidth()/2 - scaleWidth);
vTranslate.y = Math.max(vTranslate.y, getHeight()/2 - scaleHeight);
} else if (center) {
vTranslate.x = Math.max(vTranslate.x, getWidth() - scaleWidth);
vTranslate.y = Math.max(vTranslate.y, getHeight() - scaleHeight);
vTranslate.x = Math.max(vTranslate.x, getWidth() - scaleWidth - extraRight);
vTranslate.y = Math.max(vTranslate.y, getHeight() - scaleHeight - extraBottom);
} else {
vTranslate.x = Math.max(vTranslate.x, -scaleWidth);
vTranslate.y = Math.max(vTranslate.y, -scaleHeight);
vTranslate.x = Math.max(vTranslate.x, -scaleWidth - extraRight);
vTranslate.y = Math.max(vTranslate.y, -scaleHeight - extraBottom);
}

// Asymmetric padding adjustments
Expand All @@ -1441,11 +1453,11 @@ private void fitToBounds(boolean center, ScaleAndTranslate sat) {
maxTx = Math.max(0, getWidth()/2);
maxTy = Math.max(0, getHeight()/2);
} else if (center) {
maxTx = Math.max(0, (getWidth() - scaleWidth) * xPaddingRatio);
maxTy = Math.max(0, (getHeight() - scaleHeight) * yPaddingRatio);
maxTx = Math.max(extraLeft, (getWidth() - scaleWidth) * xPaddingRatio);
maxTy = Math.max(extraTop, (getHeight() - scaleHeight) * yPaddingRatio);
} else {
maxTx = Math.max(0, getWidth());
maxTy = Math.max(0, getHeight());
maxTx = Math.max(extraLeft, getWidth());
maxTy = Math.max(extraTop, getHeight());
}

vTranslate.x = Math.min(vTranslate.x, maxTx);
Expand Down Expand Up @@ -2266,8 +2278,12 @@ private PointF limitedSCenter(float sCenterX, float sCenterY, float scale, @NonN
* Returns the minimum allowed scale.
*/
private float minScale() {
int vPadding = getPaddingBottom() + getPaddingTop();
int hPadding = getPaddingLeft() + getPaddingRight();
boolean extra = panLimit == PAN_LIMIT_INSIDE;
int vExtra = extra ? Math.round(vExtraSpaceBottom + vExtraSpaceTop) : 0;
int hExtra = extra ? Math.round(vExtraSpaceLeft + vExtraSpaceRight) : 0;

int vPadding = getPaddingBottom() + getPaddingTop() + vExtra;
int hPadding = getPaddingLeft() + getPaddingRight() + hExtra;
if (minimumScaleType == SCALE_TYPE_CENTER_CROP || minimumScaleType == SCALE_TYPE_START) {
return Math.max((getWidth() - hPadding) / (float) sWidth(), (getHeight() - vPadding) / (float) sHeight());
} else if (minimumScaleType == SCALE_TYPE_CUSTOM && minScale > 0) {
Expand Down Expand Up @@ -2548,6 +2564,96 @@ public void setMinimumTileDpi(int minimumTileDpi) {
}
}

/**
* Sets extra space for the view.
* Extra space artificially increases image size, allowing to pan further from the side.
* Extra space also lowers minScale.
* Extra space is zoom-agnostic thus constant in terms of view pixels not source pixels.
* Extra space is respected only in {@link #PAN_LIMIT_INSIDE} pan mode and ignored in others.
* @param vLeft extra space on the left
* @param vTop extra space on the top
* @param vRight extra space on the right
* @param vBottom extra space on the bottom
*/
public void setExtraSpace(float vLeft, float vTop, float vRight, float vBottom) {
vExtraSpaceLeft = vLeft;
vExtraSpaceTop = vTop;
vExtraSpaceRight = vRight;
vExtraSpaceBottom = vBottom;
}

/**
* Returns extra space for the view contained in {@link RectF}.
* @return extra space for all sides of view in view pixels
*/
public RectF getExtraSpace() {
return new RectF(vExtraSpaceLeft, vExtraSpaceTop, vExtraSpaceRight, vExtraSpaceBottom);
}

/**
* @see #setExtraSpace(float, float, float, float)
* @return left extra space in view pixels
*/
public float getExtraSpaceLeft() {
return vExtraSpaceLeft;
}

/**
* Sets left extra space for the view in view pixels.
* @see #setExtraSpace(float, float, float, float)
*/
public void setExtraSpaceLeft(float vLeft) {
this.vExtraSpaceLeft = vLeft;
}

/**
* @see #setExtraSpace(float, float, float, float)
* @return top extra space in view pixels
*/
public float getExtraSpaceTop() {
return vExtraSpaceTop;
}

/**
* Sets top extra space for the view in view pixels.
* @see #setExtraSpace(float, float, float, float)
*/
public void setExtraSpaceTop(float vTop) {
this.vExtraSpaceTop = vTop;
}

/**
* @see #setExtraSpace(float, float, float, float)
* @return right extra space in view pixels
*/
public float getExtraSpaceRight() {
return vExtraSpaceRight;
}

/**
* Sets right extra space for the view in view pixels.
* @see #setExtraSpace(float, float, float, float)
*/
public void setExtraSpaceRight(float vRight) {
this.vExtraSpaceRight = vRight;
}

/**
* @see #setExtraSpace(float, float, float, float)
* @return bottom extra space in view pixels
*/
public float getExtraSpaceBottom() {
return vExtraSpaceBottom;
}

/**
* Sets bottom extra space for the view in view pixels.
* @see #setExtraSpace(float, float, float, float)
*/
public void setExtraSpaceBottom(float vBottom) {
this.vExtraSpaceBottom = vBottom;
}

/**
* Returns the source point at the center of the view.
* @return the source coordinates current at the center of the view.
Expand Down Expand Up @@ -3180,9 +3286,9 @@ public interface OnImageEventListener {
void onTileLoadError(Exception e);

/**
* Called when a bitmap set using ImageSource.cachedBitmap is no longer being used by the View.
* This is useful if you wish to manage the bitmap after the preview is shown
*/
* Called when a bitmap set using ImageSource.cachedBitmap is no longer being used by the View.
* This is useful if you wish to manage the bitmap after the preview is shown
*/
void onPreviewReleased();
}

Expand Down