scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #273 from drigz/bugfix/fix-initial-scroll

Browse source 
Fix initial scroll position with fixed flyout
This commit is contained in:
Rodrigo Queiro 2016-04-29 11:06:22 +02:00
commit a21a7e6851
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/inject.js
View file

@ -259,12 +259,19 @@ Blockly.init_ = function(mainWorkspace) {
// Build a fixed flyout with the root blocks.
mainWorkspace.flyout_.init(mainWorkspace);
mainWorkspace.flyout_.show(options.languageTree.childNodes);
// Translate the workspace sideways to avoid the fixed flyout.
mainWorkspace.scrollX = mainWorkspace.flyout_.width_;
if (options.toolboxPosition == Blockly.TOOLBOX_AT_RIGHT) {
mainWorkspace.scrollX *= -1;
// Translate the workspace to avoid the fixed flyout.
if (options.horizontalLayout) {
mainWorkspace.scrollY = mainWorkspace.flyout_.height_;
if (options.toolboxPosition == Blockly.TOOLBOX_AT_BOTTOM) {
mainWorkspace.scrollY *= -1;
}
} else {
mainWorkspace.scrollX = mainWorkspace.flyout_.width_;
if (options.toolboxPosition == Blockly.TOOLBOX_AT_RIGHT) {
mainWorkspace.scrollX *= -1;
}
}
mainWorkspace.translate(mainWorkspace.scrollX, 0);
mainWorkspace.translate(mainWorkspace.scrollX, mainWorkspace.scrollY);
}
}