scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2025-01-10 22:47:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #982 from fsih/fixCrosshairSize

Browse source 
Fix not resizing the crosshair when switching tabs and coming back to the costume tab
This commit is contained in:
Karishma Chadha 2020-02-13 12:34:11 -05:00 committed by GitHub
commit 4de64022d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/containers/paper-canvas.jsx
View file

@ -11,7 +11,7 @@ import {undoSnapshot, clearUndoState} from '../reducers/undo';
import {isGroup, ungroupItems} from '../helper/group';
import {clearRaster, getRaster, setupLayers} from '../helper/layer';
import {clearSelectedItems} from '../reducers/selected-items';
import {ART_BOARD_WIDTH, ART_BOARD_HEIGHT, resetZoom, zoomToFit} from '../helper/view';
import {ART_BOARD_WIDTH, ART_BOARD_HEIGHT, resetZoom, resizeCrosshair, zoomToFit} from '../helper/view';
import {ensureClockwise, scaleWithStrokes} from '../helper/math';
import {clearHoveredItem} from '../reducers/hover';
import {clearPasteOffset} from '../reducers/clipboard';
@ -151,6 +151,7 @@ class PaperCanvas extends React.Component {
if (this.shouldZoomToFit instanceof paper.Matrix) {
paper.view.matrix = this.shouldZoomToFit;
this.props.updateViewBounds(paper.view.matrix);
resizeCrosshair();
} else if (this.shouldZoomToFit === true) {
zoomToFit(isBitmapMode);
this.props.updateViewBounds(paper.view.matrix);

9
src/helper/view.js
View file

@ -31,7 +31,7 @@ const clampViewBounds = () => {
}
};
const _resizeCrosshair = () => {
const resizeCrosshair = () => {
if (getDragCrosshairLayer() && getDragCrosshairLayer().dragCrosshair) {
getDragCrosshairLayer().dragCrosshair.scale(
CROSSHAIR_SIZE / getDragCrosshairLayer().dragCrosshair.bounds.width / paper.view.zoom);
@ -55,7 +55,7 @@ const zoomOnFixedPoint = (deltaZoom, fixedPoint) => {
view.zoom = newZoom;
view.translate(postZoomOffset.multiply(-1));
clampViewBounds();
_resizeCrosshair();
resizeCrosshair();
};
// Zoom keeping the selection center (if any) fixed.
@ -80,7 +80,7 @@ const zoomOnSelection = deltaZoom => {
const resetZoom = () => {
paper.project.view.zoom = .5;
_resizeCrosshair();
resizeCrosshair();
clampViewBounds();
};
@ -106,7 +106,7 @@ const zoomToFit = isBitmap => {
if (ratio < 1) {
paper.view.center = bounds.center;
paper.view.zoom = paper.view.zoom / ratio;
_resizeCrosshair();
resizeCrosshair();
clampViewBounds();
}
}
@ -121,6 +121,7 @@ export {
clampViewBounds,
pan,
resetZoom,
resizeCrosshair,
zoomOnSelection,
zoomOnFixedPoint,
zoomToFit