limit expanding rings in special HOFs to 2 parameters

pull/89/head
jmoenig 2019-11-02 12:54:39 +01:00
rodzic 4c8f03547f
commit a5d10fcf0f
3 zmienionych plików z 11 dodań i 3 usunięć

Wyświetl plik

@ -8,6 +8,9 @@
* **Translation Updates:**
* German
### 2019-11-01
* blocks: limit expanding rings in special HOFs to 2 parameters
### 2019-11-01
* new dev version
* expanding the rings in "map", "keep" and "find" shows 3 inputs named "item", "idx" and "data"

Wyświetl plik

@ -6,7 +6,7 @@
<link rel="shortcut icon" href="src/favicon.ico">
<script type="text/javascript" src="src/morphic.js?version=2019-10-29"></script>
<script type="text/javascript" src="src/widgets.js?version=2019-10-16"></script>
<script type="text/javascript" src="src/blocks.js?version=2019-11-01"></script>
<script type="text/javascript" src="src/blocks.js?version=2019-11-02"></script>
<script type="text/javascript" src="src/threads.js?version=2019-10-30"></script>
<script type="text/javascript" src="src/objects.js?version=2019-10-31"></script>
<script type="text/javascript" src="src/gui.js?version=2019-11-01"></script>

Wyświetl plik

@ -148,7 +148,7 @@ CustomCommandBlockMorph, SymbolMorph, ToggleButtonMorph, DialMorph*/
// Global stuff ////////////////////////////////////////////////////////
modules.blocks = '2019-November-01';
modules.blocks = '2019-November-02';
var SyntaxElementMorph;
var BlockMorph;
@ -11016,8 +11016,9 @@ MultiArgMorph.prototype.fixArrowsLayout = function () {
arrows = this.arrows(),
leftArrow = arrows.children[0],
rightArrow = arrows.children[1],
inpCount = this.inputs().length,
dim = new Point(rightArrow.width() / 2, rightArrow.height());
if (this.inputs().length < (this.minInputs + 1)) {
if (inpCount < (this.minInputs + 1)) { // hide left arrow
if (label) {
label.hide();
}
@ -11026,11 +11027,15 @@ MultiArgMorph.prototype.fixArrowsLayout = function () {
arrows.position().subtract(new Point(dim.x, 0))
);
arrows.setExtent(dim);
} else if (this.is3ArgRingInHOF() && inpCount > 2) { // hide right arrow
rightArrow.hide();
arrows.setExtent(dim);
} else {
if (label) {
label.show();
}
leftArrow.show();
rightArrow.show();
rightArrow.setPosition(leftArrow.topCenter());
arrows.bounds.corner = rightArrow.bottomRight().copy();
}