Skip to content

Fix center image #666

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

Open
mokraemer wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fix center image #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
472efc0
added function to set viewport after croppie was instantiated
mokraemer Jul 1, 2019
68ded09
default zoom does not show the whole picture
mokraemer Jul 1, 2019
cb583a9
Merge branch 'setViewPort'
mokraemer Jul 1, 2019
1f6770d
added documentation
mokraemer Jul 1, 2019
d22abd8
Merge branch 'setViewPort'
mokraemer Jul 1, 2019
c71c710
fix bad formated comment
mokraemer Jul 2, 2019
513fadc
Fix resulting image, if centerpoint and zoom not called in the correc…
mokraemer Jul 2, 2019
8028e8f
if the image is rotated and does not fully fit in the container, it i…
mokraemer Jul 2, 2019
6467996
Merge branch 'setViewPort'
mokraemer Jul 2, 2019
3783929
Merge branch 'fixDefaultZoom'
mokraemer Jul 2, 2019
a1cd42b
Merge branch 'master' into fixCenterImage
mokraemer Jul 2, 2019
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
59 changes: 48 additions & 11 deletions croppie.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@
};
}

function _updateCenterPoint(rotate) {
function _updateCenterPoint() {
var self = this,
scale = self._currentZoom,
data = self.elements.preview.getBoundingClientRect(),
Expand All @@ -767,7 +767,7 @@
center = {},
adj = {};

if (rotate) {
/*if (rotate) { //this does not work as expected, use centerImage instead
var cx = pc.x;
var cy = pc.y;
var tx = transform.x;
Expand All @@ -778,7 +778,7 @@
transform.y = tx;
transform.x = ty;
}
else {
else {*/
center.y = top / scale;
center.x = left / scale;

Expand All @@ -787,7 +787,7 @@

transform.x -= adj.x;
transform.y -= adj.y;
}
//}

var newCss = {};
newCss[CSS_TRANS_ORG] = center.x + 'px ' + center.y + 'px';
Expand Down Expand Up @@ -1091,7 +1091,7 @@
_setZoomerVal.call(self, scale < zoomer.min ? zoomer.min : zoomer.max);
}
else if (initial) {
defaultInitialZoom = Math.max((boundaryData.width / imgData.width), (boundaryData.height / imgData.height));
defaultInitialZoom = Math.min((boundaryData.width / imgData.width), (boundaryData.height / imgData.height));
initialZoom = self.data.boundZoom !== null ? self.data.boundZoom : defaultInitialZoom;
_setZoomerVal.call(self, initialZoom);
}
Expand Down Expand Up @@ -1127,15 +1127,27 @@
self._currentZoom = scale;
}

function _centerImage() {
function _centerImage(rotate) {
var self = this,
imgDim = self.elements.preview.getBoundingClientRect(),
vpDim = self.elements.viewport.getBoundingClientRect(),
boundDim = self.elements.boundary.getBoundingClientRect(),
vpLeft = vpDim.left - boundDim.left,
vpTop = vpDim.top - boundDim.top,
w = vpLeft - ((imgDim.width - vpDim.width) / 2),
h = vpTop - ((imgDim.height - vpDim.height) / 2),
vpLeft,
vpTop,
w,
h,
transform;

if(rotate){//in case of rotation reset earlier transformations, so this calculation is not added on top
var newCss = {};
newCss[CSS_TRANS_ORG] = 0 + 'px ' + 0 + 'px';
css(self.elements.preview, newCss);
}

vpLeft = vpDim.left - boundDim.left;
vpTop = vpDim.top - boundDim.top;
w = vpLeft - ((imgDim.width - vpDim.width) / 2);
h = vpTop - ((imgDim.height - vpDim.height) / 2);
transform = new Transform(w, h, self._currentZoom);

css(self.elements.preview, CSS_TRANSFORM, transform.toString());
Expand Down Expand Up @@ -1471,8 +1483,9 @@

self.data.orientation = getExifOffset(self.data.orientation, deg);
drawCanvas(canvas, self.elements.img, self.data.orientation);
_updateCenterPoint.call(self, true);
_updateCenterPoint.call(self);
_updateZoomLimits.call(self);
_centerImage.call(self, true);

// Reverses image dimensions if the degrees of rotation is not divisible by 180.
if ((Math.abs(deg) / 90) % 2 === 1) {
Expand Down Expand Up @@ -1538,6 +1551,26 @@
};
}

/** Update viewport to new dimensions
* @param w int new width in px
* @param h int new height in px
*/
function _setViewport(w, h) {
var self = this;

self.options.viewport.height = h;
self.options.viewport.width = w;
css(self.elements.viewport, {
height: self.options.viewport.height + 'px',
width: self.options.viewport.width + 'px'
});

_updateOverlay.call(self);
_updateCenterPoint.call(self);
_updateZoomLimits.call(self);
_triggerUpdate.call(self);
}

function Croppie(element, opts) {
if (element.className.indexOf('croppie-container') > -1) {
throw new Error("Croppie: Can't initialize croppie more than once");
Expand Down Expand Up @@ -1630,6 +1663,10 @@
},
destroy: function () {
return _destroy.call(this);
},
/** update viewport to new dimensions */
setViewport: function (widthVP, heightVP) {
_setViewport.call(this, widthVP, heightVP);
}
});
return Croppie;
Expand Down
12 changes: 12 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,18 @@ <h3>Methods</h3>
</li>
</ul>
</li>
<li id="setViewPort">
<strong class="focus">setViewPort(width, height)</strong><em></em>
<p>Set the viewport of a Croppie instance. The width and height are the new values set to the viewport.</p>
<ul class="parameter-list">
<li>
<code class="language-javascript">width</code> the new width for the viewport.
</li>
<li>
<code class="language-javascript">height</code> the new height for the viewport.
</li>
</ul>
</li>
</ul>
</section>
<section>
Expand Down