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

clear mRestoreCropWindowRect and mRestoreDegreesRotated when using setImageBitmap #69

Merged
merged 3 commits into from
Feb 27, 2021
Merged

clear mRestoreCropWindowRect and mRestoreDegreesRotated when using setImageBitmap #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42da43a
!68 - clear mRestoreCropWindowRect and mRestoreDegreesRotated
chriscoomber Feb 25, 2021
4ba15d4
Code review markups
chriscoomber Feb 26, 2021
3e462e8
Update CHANGELOG.md
chriscoomber Feb 26, 2021
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
### Added
- CropImage.getActivityResult(data).getBitmap(context) [#49](https://github.com/CanHub/Android-Image-Cropper/issues/49)

### Fixed
- CropImageView incorrectly restored on rotation [#68](https://github.com/CanHub/Android-Image-Cropper/issues/68)

## [2.1.0] - 11/02/21
### Changed
- From Java to Kotlin: [CropImageOptions](https://github.com/CanHub/Android-Image-Cropper/issues/40), [CropWindowHandler](https://github.com/CanHub/Android-Image-Cropper/issues/37)
Expand Down
5 changes: 3 additions & 2 deletions cropper/src/main/java/com/canhub/cropper/CropImageView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,8 +1022,6 @@ public void setImageUriAsync(Uri uri) {

// either no existing task is working or we canceled it, need to load new URI
clearImageInt();
mRestoreCropWindowRect = null;
mRestoreDegreesRotated = 0;
mCropOverlayView.setInitialCropWindowRect(null);
mBitmapLoadingWorkerJob = new WeakReference<>(new BitmapLoadingWorkerJob((FragmentActivity)getContext(),this, uri));
mBitmapLoadingWorkerJob.get().start();
Expand Down Expand Up @@ -1236,6 +1234,8 @@ private void clearImageInt() {
mZoomOffsetY = 0;
mImageMatrix.reset();
mSaveInstanceStateBitmapUri = null;
mRestoreCropWindowRect = null;
mRestoreDegreesRotated = 0;

mImageView.setImageBitmap(null);

Expand Down Expand Up @@ -1527,6 +1527,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
if (mRestoreDegreesRotated != mInitialDegreesRotated) {
mDegreesRotated = mRestoreDegreesRotated;
applyImageMatrix(r - l, b - t, true, false);
mRestoreDegreesRotated = 0;
}
mImageMatrix.mapRect(mRestoreCropWindowRect);
mCropOverlayView.setCropWindowRect(mRestoreCropWindowRect);
Expand Down