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

Bugfix Precropping issue #71

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Bugfix Precropping issue #71

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d88edbe
Bugfix Precropping issue
margorski Nov 16, 2021
c0ae7b0
Fixing recenter for vertical images
margorski Nov 16, 2021
7206424
After review changes
margorski Nov 17, 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
91 changes: 35 additions & 56 deletions lib/src/crop.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ class _CropState extends State<Crop> with TickerProviderStateMixin {
final _key = GlobalKey();
final _parent = GlobalKey();
final _repaintBoundaryKey = GlobalKey();
final _childKey = GlobalKey();

double _previousScale = 1;
Offset _previousOffset = Offset.zero;
Expand Down Expand Up @@ -114,66 +115,44 @@ class _CropState extends State<Crop> with TickerProviderStateMixin {
}

void _reCenterImage([bool animate = true]) {
//final totalSize = _parent.currentContext.size;

final sz = _key.currentContext!.size!;
final s = widget.controller._scale * widget.controller._getMinScale();
final w = sz.width;
final h = sz.height;
final offset = _toVector2(widget.controller._offset);
final canvas = Rectangle.fromLTWH(0, 0, w, h);
final obb = Obb2(
center: offset + canvas.center,
width: w * s,
height: h * s,
rotation: widget.controller._rotation,
);

final bakedObb = obb.bake();

_startOffset = widget.controller._offset;
_endOffset = widget.controller._offset;

final ctl = canvas.topLeft;
final ctr = canvas.topRight;
final cbr = canvas.bottomRight;
final cbl = canvas.bottomLeft;

final ll = Line(bakedObb.topLeft, bakedObb.bottomLeft);
final tt = Line(bakedObb.topRight, bakedObb.topLeft);
final rr = Line(bakedObb.bottomRight, bakedObb.topRight);
final bb = Line(bakedObb.bottomLeft, bakedObb.bottomRight);

final tl = ll.project(ctl);
final tr = tt.project(ctr);
final br = rr.project(cbr);
final bl = bb.project(cbl);

final dtl = ll.distanceToPoint(ctl);
final dtr = tt.distanceToPoint(ctr);
final dbr = rr.distanceToPoint(cbr);
final dbl = bb.distanceToPoint(cbl);

if (dtl > 0) {
final d = _toOffset(ctl - tl);
_endOffset += d;
}

if (dtr > 0) {
final d = _toOffset(ctr - tr);
_endOffset += d;
final childWidgetSize =
(_childKey.currentContext?.findRenderObject() as RenderBox).size;

double w, h;
final ratio = childWidgetSize.aspectRatio / sz.aspectRatio;
if (childWidgetSize.aspectRatio < 1.0) {
// Vertical image. Height needs to be rescaled according to ratio.
w = sz.width;
h = sz.height / ratio;
} else {
// Horizontal or square image. Width needs to be rescaled according to ratio (for square ratio is 1.0).
w = sz.width * ratio;
h = sz.height;
}

if (dbr > 0) {
final d = _toOffset(cbr - br);
_endOffset += d;
}
if (dbl > 0) {
final d = _toOffset(cbl - bl);
_endOffset += d;
}
final canvas = Rect.fromLTWH(0, 0, w, h);
final imageBoundaries = Rect.fromCenter(
center: widget.controller._offset + canvas.center,
width: w * s * cos(vm.radians(widget.controller._rotation)).abs() +
h * s * sin(vm.radians(widget.controller._rotation)).abs(),
height: w * s * sin(vm.radians(widget.controller._rotation)).abs() +
h * s * cos(vm.radians(widget.controller._rotation)).abs());

var clampBoundaries = Rect.fromCenter(
center: Offset.zero,
width: ((imageBoundaries.width - sz.width).abs().floorToDouble()),
height: (imageBoundaries.height - sz.height).abs().floorToDouble());

final clampedOffset = Offset(
widget.controller._offset.dx
.clamp(clampBoundaries.left, clampBoundaries.right),
widget.controller._offset.dy
.clamp(clampBoundaries.top, clampBoundaries.bottom));

widget.controller._offset = _endOffset;
_startOffset = widget.controller._offset;
widget.controller._offset = _endOffset = clampedOffset;

if (animate) {
if (_controller.isCompleted || _controller.isAnimating) {
Expand Down Expand Up @@ -255,7 +234,7 @@ class _CropState extends State<Crop> with TickerProviderStateMixin {
..rotateZ(r)
..scale(s, s, 1),
child: FittedBox(
child: widget.child,
child: Container(key: _childKey, child: widget.child),
fit: BoxFit.cover,
),
),
Expand Down