mirror of
https://github.com/google/blockly.git
synced 2026-01-09 01:50:11 +01:00
This is a squash and merge of a large set of changes by @BeksOmega * Added functionality to scrolling, dragging, and zooming. * Fixed incorrect changes to workspaceChanged function. * Fixed comment. * Fixed typo. * Removed scrollbar.set calls from workspace_svg. * Removed scrollbar.resize() call. * Added move options to playground. * Fixed scroll_ calls that replaced scrollbar.set calls. * Removed this.scrollbar checks. * Changed zoom so that it always zooms towards the coordinates. Changed isContentBounded_ to be separate from isMovable_ (b/c of the previous change zoomControls had to be added to the bounded check). Fixed scroll_() calls... again. * Changed procedures so the Highlight definition option is only available if the workspace is moveable. * Fixed scrollCenter so that it works with flyout toolboxes. * Fixed zoomToFit so that it works with horizontal flyout toolboxes. * Fixed Typo. * Fixed bumping blocks when the workspace is not movable. * Fixed bumping not working with left and top toolbox positions. * Re-Added not allowing scrollCenter if the workspace is not movable. Disabled scrollCenter button for this case. * Cleaned up formatting. * Fixed bumping... again. Reformatted workspaceChanged a bit. * Changed blocks to be completely bumped into the workspace. * Reorganized metrics-getting for workspaceChanged. * Added bumping workspace comments. Moved event checking. * Renamed workspaceChanged to bumpObjects. * Added a bumpObjects developer reminder. * Added warning to zoomToFit. * Cleaned up some text. * Added better inline documentation. * Fixed up inline docs. * Cleaned up comments. * Fixed zoomCenter not actually zooming towards the center. * Fixed zoomControls error on unmovable bottom-toolbox workspaces * Fixed programatically placing blocks in an unmovable workspace. * Removed unnecessary translate call in inject. * Reversed removal of translate. (apparently it was necessary) * Cleaned up code in response to first round of reviews. * Added unit comments to the zoom function. * Removed bumpObjectsEventChecker. Added BUMP_EVENTS list to Blockly.Events. * Changed getWorkspaceObjectMetrics call to getBoundingRectangle(). * Fixed utils.mouseToSvg (was causing problems with zoom on wheel if the page was scrolled). * Fixed zoom when page is scrolled (actually this time). Reverted changes to utils.mouseToSvg. * Fixed centerOnBlock. * Added unit docs to translate. Moved setting the grid position to the translate function. * Added TODO's.
341 lines
10 KiB
JavaScript
341 lines
10 KiB
JavaScript
/**
|
|
* @license
|
|
* Visual Blocks Editor
|
|
*
|
|
* Copyright 2015 Google Inc.
|
|
* https://developers.google.com/blockly/
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Object representing a zoom icons.
|
|
* @author carloslfu@gmail.com (Carlos Galarza)
|
|
*/
|
|
'use strict';
|
|
|
|
goog.provide('Blockly.ZoomControls');
|
|
|
|
goog.require('Blockly.Touch');
|
|
goog.require('Blockly.utils');
|
|
|
|
|
|
/**
|
|
* Class for a zoom controls.
|
|
* @param {!Blockly.Workspace} workspace The workspace to sit in.
|
|
* @constructor
|
|
*/
|
|
Blockly.ZoomControls = function(workspace) {
|
|
this.workspace_ = workspace;
|
|
};
|
|
|
|
/**
|
|
* Width of the zoom controls.
|
|
* @type {number}
|
|
* @private
|
|
*/
|
|
Blockly.ZoomControls.prototype.WIDTH_ = 32;
|
|
|
|
/**
|
|
* Height of the zoom controls.
|
|
* @type {number}
|
|
* @private
|
|
*/
|
|
Blockly.ZoomControls.prototype.HEIGHT_ = 110;
|
|
|
|
/**
|
|
* Distance between zoom controls and bottom edge of workspace.
|
|
* @type {number}
|
|
* @private
|
|
*/
|
|
Blockly.ZoomControls.prototype.MARGIN_BOTTOM_ = 20;
|
|
|
|
/**
|
|
* Distance between zoom controls and right edge of workspace.
|
|
* @type {number}
|
|
* @private
|
|
*/
|
|
Blockly.ZoomControls.prototype.MARGIN_SIDE_ = 20;
|
|
|
|
/**
|
|
* The SVG group containing the zoom controls.
|
|
* @type {Element}
|
|
* @private
|
|
*/
|
|
Blockly.ZoomControls.prototype.svgGroup_ = null;
|
|
|
|
/**
|
|
* Left coordinate of the zoom controls.
|
|
* @type {number}
|
|
* @private
|
|
*/
|
|
Blockly.ZoomControls.prototype.left_ = 0;
|
|
|
|
/**
|
|
* Top coordinate of the zoom controls.
|
|
* @type {number}
|
|
* @private
|
|
*/
|
|
Blockly.ZoomControls.prototype.top_ = 0;
|
|
|
|
/**
|
|
* Create the zoom controls.
|
|
* @return {!Element} The zoom controls SVG group.
|
|
*/
|
|
Blockly.ZoomControls.prototype.createDom = function() {
|
|
this.svgGroup_ =
|
|
Blockly.utils.createSvgElement('g', {}, null);
|
|
|
|
// Each filter/pattern needs a unique ID for the case of multiple Blockly
|
|
// instances on a page. Browser behaviour becomes undefined otherwise.
|
|
// https://neil.fraser.name/news/2015/11/01/
|
|
var rnd = String(Math.random()).substring(2);
|
|
this.createZoomOutSvg_(rnd);
|
|
this.createZoomInSvg_(rnd);
|
|
if (this.workspace_.isMovable()) {
|
|
// If we zoom to the center and the workspace isn't movable we could
|
|
// loose blocks at the edges of the workspace.
|
|
this.createZoomResetSvg_(rnd);
|
|
}
|
|
return this.svgGroup_;
|
|
};
|
|
|
|
/**
|
|
* Initialize the zoom controls.
|
|
* @param {number} verticalSpacing Vertical distances from workspace edge to the
|
|
* same edge of the controls.
|
|
* @return {number} Vertical distance from workspace edge to the opposite
|
|
* edge of the controls.
|
|
*/
|
|
Blockly.ZoomControls.prototype.init = function(verticalSpacing) {
|
|
this.verticalSpacing_ = this.MARGIN_BOTTOM_ + verticalSpacing;
|
|
return this.verticalSpacing_ + this.HEIGHT_;
|
|
};
|
|
|
|
/**
|
|
* Dispose of this zoom controls.
|
|
* Unlink from all DOM elements to prevent memory leaks.
|
|
*/
|
|
Blockly.ZoomControls.prototype.dispose = function() {
|
|
if (this.svgGroup_) {
|
|
Blockly.utils.removeNode(this.svgGroup_);
|
|
this.svgGroup_ = null;
|
|
}
|
|
this.workspace_ = null;
|
|
};
|
|
|
|
/**
|
|
* Position the zoom controls.
|
|
* It is positioned in the opposite corner to the corner the
|
|
* categories/toolbox starts at.
|
|
*/
|
|
Blockly.ZoomControls.prototype.position = function() {
|
|
// Not yet initialized.
|
|
if (!this.verticalSpacing_) {
|
|
return;
|
|
}
|
|
var metrics = this.workspace_.getMetrics();
|
|
if (!metrics) {
|
|
// There are no metrics available (workspace is probably not visible).
|
|
return;
|
|
}
|
|
if (metrics.toolboxPosition == Blockly.TOOLBOX_AT_LEFT
|
|
|| (this.workspace_.horizontalLayout && !this.workspace_.RTL)) {
|
|
// Toolbox starts in the left corner.
|
|
this.left_ = metrics.viewWidth + metrics.absoluteLeft -
|
|
this.WIDTH_ - this.MARGIN_SIDE_ - Blockly.Scrollbar.scrollbarThickness;
|
|
} else {
|
|
// Toolbox starts in the right corner.
|
|
this.left_ = this.MARGIN_SIDE_ + Blockly.Scrollbar.scrollbarThickness;
|
|
}
|
|
|
|
if (metrics.toolboxPosition == Blockly.TOOLBOX_AT_BOTTOM) {
|
|
this.top_ = this.verticalSpacing_;
|
|
this.zoomInGroup_.setAttribute('transform', 'translate(0, 34)');
|
|
if (this.zoomResetGroup_) {
|
|
this.zoomResetGroup_.setAttribute('transform', 'translate(0, 77)');
|
|
}
|
|
} else {
|
|
this.top_ = metrics.viewHeight + metrics.absoluteTop -
|
|
this.HEIGHT_ - this.verticalSpacing_;
|
|
this.zoomInGroup_.setAttribute('transform', 'translate(0, 43)');
|
|
this.zoomOutGroup_.setAttribute('transform', 'translate(0, 77)');
|
|
}
|
|
|
|
this.svgGroup_.setAttribute('transform',
|
|
'translate(' + this.left_ + ',' + this.top_ + ')');
|
|
};
|
|
|
|
/**
|
|
* Create the zoom in icon and its event handler.
|
|
* @param {string} rnd The random string to use as a suffix in the clip path's
|
|
* ID. These IDs must be unique in case there are multiple Blockly
|
|
* instances on the same page.
|
|
* @private
|
|
*/
|
|
Blockly.ZoomControls.prototype.createZoomOutSvg_ = function(rnd) {
|
|
/* This markup will be generated and added to the .svgGroup_:
|
|
<g class="blocklyZoom">
|
|
<clipPath id="blocklyZoomoutClipPath837493">
|
|
<rect width="32" height="32></rect>
|
|
</clipPath>
|
|
<image width="96" height="124" x="-64" y="-92" xlink:href="media/sprites.png"
|
|
clip-path="url(#blocklyZoomoutClipPath837493)"></image>
|
|
</g>
|
|
*/
|
|
var ws = this.workspace_;
|
|
this.zoomOutGroup_ = Blockly.utils.createSvgElement('g',
|
|
{'class': 'blocklyZoom'}, this.svgGroup_);
|
|
var clip = Blockly.utils.createSvgElement('clipPath',
|
|
{
|
|
'id': 'blocklyZoomoutClipPath' + rnd
|
|
},
|
|
this.zoomOutGroup_);
|
|
Blockly.utils.createSvgElement('rect',
|
|
{
|
|
'width': 32,
|
|
'height': 32,
|
|
},
|
|
clip);
|
|
var zoomoutSvg = Blockly.utils.createSvgElement('image',
|
|
{
|
|
'width': Blockly.SPRITE.width,
|
|
'height': Blockly.SPRITE.height,
|
|
'x': -64,
|
|
'y': -92,
|
|
'clip-path': 'url(#blocklyZoomoutClipPath' + rnd + ')'
|
|
},
|
|
this.zoomOutGroup_);
|
|
zoomoutSvg.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href',
|
|
ws.options.pathToMedia + Blockly.SPRITE.url);
|
|
|
|
// Attach listener.
|
|
Blockly.bindEventWithChecks_(zoomoutSvg, 'mousedown', null, function(e) {
|
|
ws.markFocused();
|
|
ws.zoomCenter(-1);
|
|
Blockly.Touch.clearTouchIdentifier(); // Don't block future drags.
|
|
e.stopPropagation(); // Don't start a workspace scroll.
|
|
e.preventDefault(); // Stop double-clicking from selecting text.
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Create the zoom out icon and its event handler.
|
|
* @param {string} rnd The random string to use as a suffix in the clip path's
|
|
* ID. These IDs must be unique in case there are multiple Blockly
|
|
* instances on the same page.
|
|
* @private
|
|
*/
|
|
Blockly.ZoomControls.prototype.createZoomInSvg_ = function(rnd) {
|
|
/* This markup will be generated and added to the .svgGroup_:
|
|
<g class="blocklyZoom">
|
|
<clipPath id="blocklyZoominClipPath837493">
|
|
<rect width="32" height="32"></rect>
|
|
</clipPath>
|
|
<image width="96" height="124" x="-32" y="-92" xlink:href="media/sprites.png"
|
|
clip-path="url(#blocklyZoominClipPath837493)"></image>
|
|
</g>
|
|
*/
|
|
var ws = this.workspace_;
|
|
this.zoomInGroup_ = Blockly.utils.createSvgElement('g',
|
|
{'class': 'blocklyZoom'}, this.svgGroup_);
|
|
var clip = Blockly.utils.createSvgElement('clipPath',
|
|
{
|
|
'id': 'blocklyZoominClipPath' + rnd
|
|
},
|
|
this.zoomInGroup_);
|
|
Blockly.utils.createSvgElement('rect',
|
|
{
|
|
'width': 32,
|
|
'height': 32,
|
|
},
|
|
clip);
|
|
var zoominSvg = Blockly.utils.createSvgElement('image',
|
|
{
|
|
'width': Blockly.SPRITE.width,
|
|
'height': Blockly.SPRITE.height,
|
|
'x': -32,
|
|
'y': -92,
|
|
'clip-path': 'url(#blocklyZoominClipPath' + rnd + ')'
|
|
},
|
|
this.zoomInGroup_);
|
|
zoominSvg.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href',
|
|
ws.options.pathToMedia + Blockly.SPRITE.url);
|
|
|
|
// Attach listener.
|
|
Blockly.bindEventWithChecks_(zoominSvg, 'mousedown', null, function(e) {
|
|
ws.markFocused();
|
|
ws.zoomCenter(1);
|
|
Blockly.Touch.clearTouchIdentifier(); // Don't block future drags.
|
|
e.stopPropagation(); // Don't start a workspace scroll.
|
|
e.preventDefault(); // Stop double-clicking from selecting text.
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Create the zoom reset icon and its event handler.
|
|
* @param {string} rnd The random string to use as a suffix in the clip path's
|
|
* ID. These IDs must be unique in case there are multiple Blockly
|
|
* instances on the same page.
|
|
* @private
|
|
*/
|
|
Blockly.ZoomControls.prototype.createZoomResetSvg_ = function(rnd) {
|
|
/* This markup will be generated and added to the .svgGroup_:
|
|
<g class="blocklyZoom">
|
|
<clipPath id="blocklyZoomresetClipPath837493">
|
|
<rect width="32" height="32"></rect>
|
|
</clipPath>
|
|
<image width="96" height="124" x="-32" y="-92" xlink:href="media/sprites.png"
|
|
clip-path="url(#blocklyZoomresetClipPath837493)"></image>
|
|
</g>
|
|
*/
|
|
var ws = this.workspace_;
|
|
this.zoomResetGroup_ = Blockly.utils.createSvgElement('g',
|
|
{'class': 'blocklyZoom'}, this.svgGroup_);
|
|
var clip = Blockly.utils.createSvgElement('clipPath',
|
|
{
|
|
'id': 'blocklyZoomresetClipPath' + rnd
|
|
},
|
|
this.zoomResetGroup_);
|
|
Blockly.utils.createSvgElement('rect',
|
|
{
|
|
'width': 32,
|
|
'height': 32
|
|
},
|
|
clip);
|
|
var zoomresetSvg = Blockly.utils.createSvgElement('image',
|
|
{
|
|
'width': Blockly.SPRITE.width,
|
|
'height': Blockly.SPRITE.height,
|
|
'y': -92,
|
|
'clip-path': 'url(#blocklyZoomresetClipPath' + rnd + ')'
|
|
},
|
|
this.zoomResetGroup_);
|
|
zoomresetSvg.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href',
|
|
ws.options.pathToMedia + Blockly.SPRITE.url);
|
|
|
|
// Attach event listeners.
|
|
Blockly.bindEventWithChecks_(zoomresetSvg, 'mousedown', null, function(e) {
|
|
ws.markFocused();
|
|
ws.setScale(ws.options.zoomOptions.startScale);
|
|
ws.beginCanvasTransition();
|
|
ws.scrollCenter();
|
|
setTimeout(function() {
|
|
ws.endCanvasTransition();
|
|
}, 500);
|
|
Blockly.Touch.clearTouchIdentifier(); // Don't block future drags.
|
|
e.stopPropagation(); // Don't start a workspace scroll.
|
|
e.preventDefault(); // Stop double-clicking from selecting text.
|
|
});
|
|
};
|