Skip to content
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

Jump to bottom

Add support for rendering a vertical input based cursor #2224

Merged
merged 2 commits into from
Jan 17, 2019
Merged

Add support for rendering a vertical input based cursor #2224

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34a6a8e
Add support for rendering a vertical input based cursor
Jan 17, 2019
0ee28d7
Always hide before show so you never show both types
Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions core/blockly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,6 @@ Blockly.onKeyDown_ = function(e) {
&& (e.keyCode === goog.events.KeyCodes.UP
|| e.keyCode === goog.events.KeyCodes.DOWN)) {
Blockly.Navigation.navigate(e);
} else if (Blockly.keyboardAccessibilityMode_ && e.keyCode === goog.events.KeyCodes.SPACE) {
Blockly.Navigation.setConnection();
}
// Common code for delete and cut.
// Don't delete in the flyout.
Expand Down
6 changes: 6 additions & 0 deletions core/css.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,12 @@ Blockly.Css.CONTENT = [
'max-height: 100%;',
'}',

'.blocklyVerticalCursor {',
'stroke-width: 3px;',
'stroke: #ffffff;',
'fill: rgba(255,255,255,0.5);',
'}',

'.blocklyDropdownMenu {',
'padding: 0 !important;',
'}',
Expand Down
80 changes: 65 additions & 15 deletions core/cursor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ Blockly.Cursor.CURSOR_WIDTH = 100;
*/
Blockly.Cursor.NOTCH_START_LENGTH = 24;

/**
* Padding around the input.
* @type {number}
* @const
*/
Blockly.Cursor.VERTICAL_PADDING = 5;

/**
* Cursor color.
* @type {number}
Expand All @@ -77,8 +84,7 @@ Blockly.Cursor.CURSOR_REFERENCE = null;
Blockly.Cursor.prototype.createDom = function() {
this.svgGroup_ =
Blockly.utils.createSvgElement('g', {
'class': 'blocklyCursor',
'style': 'display: none'
'class': 'blocklyCursor'
}, null);

this.createCursorSvg_();
Expand Down Expand Up @@ -128,7 +134,8 @@ Blockly.Cursor.prototype.workspaceShow = function(e) {
Blockly.Cursor.prototype.showWithCoordinates = function(x, y) {
this.CURSOR_REFERENCE = new goog.math.Coordinate(x, y);

this.show(x, y, Blockly.Cursor.CURSOR_WIDTH);
this.positionHorizontal_(x, y, Blockly.Cursor.CURSOR_WIDTH);
this.showHorizontal_();
};

/**
Expand All @@ -143,31 +150,64 @@ Blockly.Cursor.prototype.showWithConnection = function(connection) {

var targetBlock = connection.sourceBlock_;
var xy = targetBlock.getRelativeToSurfaceXY();
this.show(xy.x + connection.offsetInBlock_.x - Blockly.Cursor.NOTCH_START_LENGTH,
xy.y + connection.offsetInBlock_.y, targetBlock.getHeightWidth().width);
if (connection.type == Blockly.INPUT_VALUE || connection.type == Blockly.OUTPUT_VALUE) {
targetBlock = connection.targetConnection.sourceBlock_;
this.positionVertical_(xy.x + connection.offsetInBlock_.x - Blockly.Cursor.VERTICAL_PADDING,
xy.y + connection.offsetInBlock_.y - Blockly.Cursor.VERTICAL_PADDING,
targetBlock.getHeightWidth().width + (Blockly.Cursor.VERTICAL_PADDING * 2),
targetBlock.getHeightWidth().height + (Blockly.Cursor.VERTICAL_PADDING * 2));
this.showVertical_();
} else {
this.positionHorizontal_(xy.x + connection.offsetInBlock_.x - Blockly.Cursor.NOTCH_START_LENGTH,
xy.y + connection.offsetInBlock_.y, targetBlock.getHeightWidth().width);
this.showHorizontal_();
}
};

/**
* Move and show the cursor at the specified coordinate in workspace units.
* @param {number} x The new x, in workspace units.
* @param {number} y The new y, in workspace units.
* @param {number} width The new width, in workspace units.
*/
Blockly.Cursor.prototype.positionHorizontal_ = function(x, y, width) {
var cursorSize = new goog.math.Size(Blockly.Cursor.CURSOR_WIDTH, Blockly.Cursor.CURSOR_HEIGHT);

this.cursorSvgHorizontal_.setAttribute('x', x + (this.workspace_.RTL ? -cursorSize.width : cursorSize.width));
this.cursorSvgHorizontal_.setAttribute('y', y);
this.cursorSvgHorizontal_.setAttribute('width', width);
};

/**
* Move and show the cursor at the specified coordinate in workspace units.
* @param {number} x The new x, in workspace units.
* @param {number} y The new y, in workspace units.
* @param {number} width The new width, in workspace units.
* @param {number} height The new height, in workspace units.
*/
Blockly.Cursor.prototype.show = function(x, y, width) {
Blockly.Cursor.prototype.positionVertical_ = function(x, y, width, height) {
var cursorSize = new goog.math.Size(Blockly.Cursor.CURSOR_WIDTH, Blockly.Cursor.CURSOR_HEIGHT);

this.cursorSvgRect_.setAttribute('x', x + (this.workspace_.RTL ? -cursorSize.width : cursorSize.width));
this.cursorSvgRect_.setAttribute('y', y);
this.cursorSvgRect_.setAttribute('width', width);

this.svgGroup_.style.display = '';
this.cursorSvgVertical_.setAttribute('x', x + (this.workspace_.RTL ? -cursorSize.width : cursorSize.width));
this.cursorSvgVertical_.setAttribute('y', y);
this.cursorSvgVertical_.setAttribute('width', width);
this.cursorSvgVertical_.setAttribute('height', height);
};

Blockly.Cursor.prototype.showHorizontal_ = function() {
this.cursorSvgHorizontal_.style.display = '';
};

Blockly.Cursor.prototype.showVertical_ = function() {
this.cursorSvgVertical_.style.display = '';
};

/**
* Hide the cursor.
*/
Blockly.Cursor.prototype.hide = function() {
this.svgGroup_.style.display = 'none';
this.cursorSvgHorizontal_.style.display = 'none';
this.cursorSvgVertical_.style.display = 'none';
};

/**
Expand All @@ -189,13 +229,14 @@ Blockly.Cursor.prototype.createCursorSvg_ = function() {
'width': Blockly.Cursor.CURSOR_WIDTH,
'height': Blockly.Cursor.CURSOR_HEIGHT
}, this.svgGroup_);
this.cursorSvgRect_ = Blockly.utils.createSvgElement('rect',
this.cursorSvgHorizontal_ = Blockly.utils.createSvgElement('rect',
{
'x': '0',
'y': '0',
'fill': Blockly.Cursor.CURSOR_COLOR,
'width': Blockly.Cursor.CURSOR_WIDTH,
'height': Blockly.Cursor.CURSOR_HEIGHT
'height': Blockly.Cursor.CURSOR_HEIGHT,
'style': 'display: none;'
},
this.cursorSvg_);
Blockly.utils.createSvgElement('animate',
Expand All @@ -206,6 +247,15 @@ Blockly.Cursor.prototype.createCursorSvg_ = function() {
'values': Blockly.Cursor.CURSOR_COLOR + ';transparent;transparent;',
'repeatCount': 'indefinite'
},
this.cursorSvgRect_);
this.cursorSvgHorizontal_);
this.cursorSvgVertical_ = Blockly.utils.createSvgElement('rect',
{
'class': 'blocklyVerticalCursor',
'x': '0',
'y': '0',
'rx': '10', 'ry': '10',
'style': 'display: none;'
},
this.cursorSvg_);
return this.cursorSvg_;
};
3 changes: 3 additions & 0 deletions core/gesture.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,9 @@ Blockly.Gesture.prototype.doStart = function(e) {

if (this.targetBlock_) {
this.targetBlock_.select();
if (!this.targetBlock_.isInFlyout && e.shiftKey) {
Blockly.Navigation.setConnection();
}
}

if (Blockly.utils.isRightButton(e)) {
Expand Down
1 change: 1 addition & 0 deletions core/navigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Blockly.Navigation.navigateBetweenStacks = function(forward) {
};

Blockly.Navigation.setConnection = function() {
Blockly.keyboardAccessibilityMode_ = true;
Blockly.Navigation.connection = Blockly.selected.previousConnection;
Blockly.cursor.showWithConnection(Blockly.selected.previousConnection);
};
Expand Down