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 #2240 from BeksOmega/fixes/TrashcanHotspot

Browse Source 
Fixed Trashcan Hotspot & Changed Positioning
This commit is contained in:
Rachel Fenichel
2019-01-28 16:21:43 -08:00
committed by GitHub
parent b7fc1f8dab 363ff487a4
commit b8a028e63c
4 changed files with 23 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/flyout_horizontal.js
View File

@@ -366,8 +366,6 @@ Blockly.HorizontalFlyout.prototype.reflowInternal_ = function() {
}
// Record the height for .getMetrics_ and .position.
this.height_ = flyoutHeight;
// Call this since it is possible the trash and zoom buttons need
// to move. e.g. on a bottom positioned flyout when zoom is clicked.
this.targetWorkspace_.resize();
this.position();
}
};

4
core/flyout_vertical.js
View File

@@ -392,8 +392,6 @@ Blockly.VerticalFlyout.prototype.reflowInternal_ = function() {
}
// Record the width for .getMetrics_ and .position.
this.width_ = flyoutWidth;
// Call this since it is possible the trash and zoom buttons need
// to move. e.g. on a bottom positioned flyout when zoom is clicked.
this.targetWorkspace_.resize();
this.position();
}
};

29
core/trashcan.js
View File

@@ -56,7 +56,8 @@ Blockly.Trashcan = function(workspace) {
Blockly.TOOLBOX_AT_BOTTOM : Blockly.TOOLBOX_AT_TOP;
this.flyout_ = new Blockly.HorizontalFlyout(flyoutWorkspaceOptions);
} else {
flyoutWorkspaceOptions.toolboxPosition = this.workspace_.RTL ?
flyoutWorkspaceOptions.toolboxPosition =
this.workspace_.toolboxPosition == Blockly.TOOLBOX_AT_RIGHT ?
Blockly.TOOLBOX_AT_LEFT : Blockly.TOOLBOX_AT_RIGHT;
this.flyout_ = new Blockly.VerticalFlyout(flyoutWorkspaceOptions);
}
@@ -304,9 +305,8 @@ Blockly.Trashcan.prototype.dispose = function() {
/**
* Position the trashcan.
* It is positioned in the upper corner when the toolbox is on bottom, and the
* bottom corner for all other toolbox positions. It is on the right in LTR,
* and left in RTL.
* It is positioned in the opposite corner to the corner the
* categories/toolbox starts at.
*/
Blockly.Trashcan.prototype.position = function() {
// Not yet initialized.
@@ -318,21 +318,14 @@ Blockly.Trashcan.prototype.position = function() {
// There are no metrics available (workspace is probably not visible).
return;
}
if (this.workspace_.RTL) {
this.left_ = this.MARGIN_SIDE_ + Blockly.Scrollbar.scrollbarThickness;
if (metrics.toolboxPosition == Blockly.TOOLBOX_AT_LEFT) {
this.left_ += metrics.flyoutWidth;
if (this.workspace_.toolbox_) {
this.left_ += metrics.absoluteLeft;
}
}
} else {
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;
if (metrics.toolboxPosition == Blockly.TOOLBOX_AT_RIGHT) {
this.left_ -= metrics.flyoutWidth;
}
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) {

25
core/zoom_controls.js
View File

@@ -131,7 +131,9 @@ Blockly.ZoomControls.prototype.dispose = function() {
};
/**
* Move the zoom controls to the bottom-right corner.
* 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.
@@ -143,21 +145,14 @@ Blockly.ZoomControls.prototype.position = function() {
// There are no metrics available (workspace is probably not visible).
return;
}
if (this.workspace_.RTL) {
this.left_ = this.MARGIN_SIDE_ + Blockly.Scrollbar.scrollbarThickness;
if (metrics.toolboxPosition == Blockly.TOOLBOX_AT_LEFT) {
this.left_ += metrics.flyoutWidth;
if (this.workspace_.toolbox_) {
this.left_ += metrics.absoluteLeft;
}
}
} else {
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;
if (metrics.toolboxPosition == Blockly.TOOLBOX_AT_RIGHT) {
this.left_ -= metrics.flyoutWidth;
}
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) {