mirror of
https://github.com/google/blockly.git
synced 2026-01-10 18:37:09 +01:00
9dec2da5c5
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.
99 lines
2.9 KiB
JavaScript
99 lines
2.9 KiB
JavaScript
/**
|
|
* @license
|
|
* Visual Blocks Editor
|
|
*
|
|
* Copyright 2017 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 Methods for dragging a workspace visually.
|
|
* @author fenichel@google.com (Rachel Fenichel)
|
|
*/
|
|
'use strict';
|
|
|
|
goog.provide('Blockly.WorkspaceDragger');
|
|
|
|
goog.require('goog.math.Coordinate');
|
|
|
|
|
|
/**
|
|
* Class for a workspace dragger. It moves the workspace around when it is
|
|
* being dragged by a mouse or touch.
|
|
* Note that the workspace itself manages whether or not it has a drag surface
|
|
* and how to do translations based on that. This simply passes the right
|
|
* commands based on events.
|
|
* @param {!Blockly.WorkspaceSvg} workspace The workspace to drag.
|
|
* @constructor
|
|
*/
|
|
Blockly.WorkspaceDragger = function(workspace) {
|
|
/**
|
|
* @type {!Blockly.WorkspaceSvg}
|
|
* @private
|
|
*/
|
|
this.workspace_ = workspace;
|
|
|
|
/**
|
|
* The scroll position of the workspace at the beginning of the drag.
|
|
* Coordinate system: pixel coordinates.
|
|
* @type {!goog.math.Coordinate}
|
|
* @private
|
|
*/
|
|
this.startScrollXY_ = new goog.math.Coordinate(
|
|
workspace.scrollX, workspace.scrollY);
|
|
};
|
|
|
|
/**
|
|
* Sever all links from this object.
|
|
* @package
|
|
*/
|
|
Blockly.WorkspaceDragger.prototype.dispose = function() {
|
|
this.workspace_ = null;
|
|
};
|
|
|
|
/**
|
|
* Start dragging the workspace.
|
|
* @package
|
|
*/
|
|
Blockly.WorkspaceDragger.prototype.startDrag = function() {
|
|
if (Blockly.selected) {
|
|
Blockly.selected.unselect();
|
|
}
|
|
this.workspace_.setupDragSurface();
|
|
};
|
|
|
|
/**
|
|
* Finish dragging the workspace and put everything back where it belongs.
|
|
* @param {!goog.math.Coordinate} currentDragDeltaXY How far the pointer has
|
|
* moved from the position at the start of the drag, in pixel coordinates.
|
|
* @package
|
|
*/
|
|
Blockly.WorkspaceDragger.prototype.endDrag = function(currentDragDeltaXY) {
|
|
// Make sure everything is up to date.
|
|
this.drag(currentDragDeltaXY);
|
|
this.workspace_.resetDragSurface();
|
|
};
|
|
|
|
/**
|
|
* Move the workspace based on the most recent mouse movements.
|
|
* @param {!goog.math.Coordinate} currentDragDeltaXY How far the pointer has
|
|
* moved from the position at the start of the drag, in pixel coordinates.
|
|
* @package
|
|
*/
|
|
Blockly.WorkspaceDragger.prototype.drag = function(currentDragDeltaXY) {
|
|
var newXY = goog.math.Coordinate.sum(this.startScrollXY_, currentDragDeltaXY);
|
|
this.workspace_.scroll(newXY.x, newXY.y);
|
|
};
|