CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-10 18:37:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3439 from rachel-fenichel/cursors_in_path_objects

Browse Source 
Move cursorSvg and markerSvg to pathObject
This commit is contained in:
Rachel Fenichel
2019-11-13 12:07:58 -08:00
committed by GitHub
parent c8d938b461 6dd07ec44d
commit f2c477229d
3 changed files with 70 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/block_svg.js
View File

@@ -109,22 +109,6 @@ Blockly.BlockSvg = function(workspace, prototypeName, opt_id) {
if (this.svgGroup_.dataset) {
this.svgGroup_.dataset['id'] = this.id;
}
/**
* Holds the cursors svg element when the cursor is attached to the block.
* This is null if there is no cursor on the block.
* @type {SVGElement}
* @private
*/
this.cursorSvg_ = null;
/**
* Holds the markers svg element when the marker is attached to the block.
* This is null if there is no marker on the block.
* @type {SVGElement}
* @private
*/
this.markerSvg_ = null;
};
Blockly.utils.object.inherits(Blockly.BlockSvg, Blockly.Block);
@@ -1700,13 +1684,7 @@ Blockly.BlockSvg.prototype.updateConnectionLocations_ = function() {
* @package
*/
Blockly.BlockSvg.prototype.setCursorSvg = function(cursorSvg) {
if (!cursorSvg) {
this.cursorSvg_ = null;
return;
}
this.svgGroup_.appendChild(cursorSvg);
this.cursorSvg_ = cursorSvg;
this.pathObject.setCursorSvg(cursorSvg);
};
/**
@@ -1716,17 +1694,7 @@ Blockly.BlockSvg.prototype.setCursorSvg = function(cursorSvg) {
* @package
*/
Blockly.BlockSvg.prototype.setMarkerSvg = function(markerSvg) {
if (!markerSvg) {
this.markerSvg_ = null;
return;
}
if (this.cursorSvg_) {
this.svgGroup_.insertBefore(markerSvg, this.cursorSvg_);
} else {
this.svgGroup_.appendChild(markerSvg);
}
this.markerSvg_ = markerSvg;
this.pathObject.setMarkerSvg(markerSvg);
};
/**

16
core/renderers/common/i_path_object.js
View File

@@ -66,6 +66,22 @@ Blockly.blockRendering.IPathObject.prototype.setStyle;
*/
Blockly.blockRendering.IPathObject.prototype.flipRTL;
/**
* Add the cursor svg to this block's svg group.
* @param {SVGElement} cursorSvg The svg root of the cursor to be added to the
* block svg group.
* @package
*/
Blockly.blockRendering.IPathObject.prototype.setCursorSvg;
/**
* Add the marker svg to this block's svg group.
* @param {SVGElement} markerSvg The svg root of the marker to be added to the
* block svg group.
* @package
*/
Blockly.blockRendering.IPathObject.prototype.setMarkerSvg;
/**
* Set whether the block shows a highlight or not. Block highlighting is
* often used to visually mark blocks currently being executed.

52
core/renderers/common/path_object.js
View File

@@ -64,6 +64,22 @@ Blockly.blockRendering.PathObject = function(root, constants) {
* @package
*/
this.style = Blockly.Theme.createBlockStyle('#000000');
/**
* Holds the cursors svg element when the cursor is attached to the block.
* This is null if there is no cursor on the block.
* @type {SVGElement}
* @private
*/
this.cursorSvg_ = null;
/**
* Holds the markers svg element when the marker is attached to the block.
* This is null if there is no marker on the block.
* @type {SVGElement}
* @private
*/
this.markerSvg_ = null;
};
/**
@@ -84,6 +100,42 @@ Blockly.blockRendering.PathObject.prototype.flipRTL = function() {
this.svgPath.setAttribute('transform', 'scale(-1 1)');
};
/**
* Add the cursor svg to this block's svg group.
* @param {SVGElement} cursorSvg The svg root of the cursor to be added to the
* block svg group.
* @package
*/
Blockly.blockRendering.PathObject.prototype.setCursorSvg = function(cursorSvg) {
if (!cursorSvg) {
this.cursorSvg_ = null;
return;
}
this.svgRoot.appendChild(cursorSvg);
this.cursorSvg_ = cursorSvg;
};
/**
* Add the marker svg to this block's svg group.
* @param {SVGElement} markerSvg The svg root of the marker to be added to the
* block svg group.
* @package
*/
Blockly.blockRendering.PathObject.prototype.setMarkerSvg = function(markerSvg) {
if (!markerSvg) {
this.markerSvg_ = null;
return;
}
if (this.cursorSvg_) {
this.svgRoot.insertBefore(markerSvg, this.cursorSvg_);
} else {
this.svgRoot.appendChild(markerSvg);
}
this.markerSvg_ = markerSvg;
};
/**
* Apply the stored colours to the block's path, taking into account whether
* the paths belong to a shadow block.