treat zoom actions as ending zoom
This commit is contained in:
parent
c6a90066a2
commit
046ce6172c
@ -254,12 +254,12 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onZoomIn(float value) {
|
public void onZoomIn(float value) {
|
||||||
zoomIn(value);
|
zoomIn(value, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onZoomOut(float value) {
|
public void onZoomOut(float value) {
|
||||||
zoomOut(value);
|
zoomOut(value, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -349,18 +349,18 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
|
|||||||
startActivityForResult(intent, ACTION_OPEN_DOCUMENT_REQUEST_CODE);
|
startActivityForResult(intent, ACTION_OPEN_DOCUMENT_REQUEST_CODE);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void zoomIn(float value) {
|
private void zoomIn(float value, boolean end) {
|
||||||
if (mZoomRatio < MAX_ZOOM_RATIO) {
|
if (mZoomRatio < MAX_ZOOM_RATIO) {
|
||||||
mZoomRatio += value;
|
mZoomRatio += value;
|
||||||
renderPage(2);
|
renderPage(end ? 1 : 2);
|
||||||
invalidateOptionsMenu();
|
invalidateOptionsMenu();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void zoomOut(float value) {
|
private void zoomOut(float value, boolean end) {
|
||||||
if (mZoomRatio > MIN_ZOOM_RATIO) {
|
if (mZoomRatio > MIN_ZOOM_RATIO) {
|
||||||
mZoomRatio -= value;
|
mZoomRatio -= value;
|
||||||
renderPage(2);
|
renderPage(end ? 1 : 2);
|
||||||
invalidateOptionsMenu();
|
invalidateOptionsMenu();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -503,11 +503,11 @@ public class PdfViewer extends AppCompatActivity implements LoaderManager.Loader
|
|||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
|
|
||||||
case R.id.action_zoom_out:
|
case R.id.action_zoom_out:
|
||||||
zoomOut(0.25f);
|
zoomOut(0.25f, true);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case R.id.action_zoom_in:
|
case R.id.action_zoom_in:
|
||||||
zoomIn(0.25f);
|
zoomIn(0.25f, true);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case R.id.action_rotate_clockwise:
|
case R.id.action_rotate_clockwise:
|
||||||
|
Loading…
Reference in New Issue
Block a user