kopia lustrzana https://github.com/backface/turtlestitch
				
				
				
			fixed block layout reach
I hope. Thanks, @brianharvey for reporting this!pull/95/head
							rodzic
							
								
									d39f279fa5
								
							
						
					
					
						commit
						6b8d67d3ad
					
				| 
						 | 
				
			
			@ -7,7 +7,7 @@
 | 
			
		|||
        <script src="src/morphic.js?version=2020-06-13"></script>
 | 
			
		||||
        <script src="src/symbols.js?version=2020-06-17"></script>
 | 
			
		||||
        <script src="src/widgets.js?version=2020-05-06"></script>
 | 
			
		||||
        <script src="src/blocks.js?version=2020-06-19"></script>
 | 
			
		||||
        <script src="src/blocks.js?version=2020-06-20"></script>
 | 
			
		||||
        <script src="src/threads.js?version=2020-06-15"></script>
 | 
			
		||||
        <script src="src/objects.js?version=2020-06-20"></script>
 | 
			
		||||
        <script src="src/gui.js?version=2020-06-08"></script>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -148,7 +148,7 @@ CustomCommandBlockMorph, SymbolMorph, ToggleButtonMorph, DialMorph*/
 | 
			
		|||
 | 
			
		||||
// Global stuff ////////////////////////////////////////////////////////
 | 
			
		||||
 | 
			
		||||
modules.blocks = '2020-June-19';
 | 
			
		||||
modules.blocks = '2020-June-20';
 | 
			
		||||
 | 
			
		||||
var SyntaxElementMorph;
 | 
			
		||||
var BlockMorph;
 | 
			
		||||
| 
						 | 
				
			
			@ -1803,7 +1803,6 @@ SyntaxElementMorph.prototype.fixLayout = function () {
 | 
			
		|||
        maxX = 0,
 | 
			
		||||
        blockWidth = this.minWidth,
 | 
			
		||||
        blockHeight,
 | 
			
		||||
        affected,
 | 
			
		||||
        l = [],
 | 
			
		||||
        lines = [],
 | 
			
		||||
        space = this.isPrototype ?
 | 
			
		||||
| 
						 | 
				
			
			@ -1812,8 +1811,7 @@ SyntaxElementMorph.prototype.fixLayout = function () {
 | 
			
		|||
        	this.methodIconExtent().x + space : 0,
 | 
			
		||||
        bottomCorrection,
 | 
			
		||||
        hasLoopCSlot = false,
 | 
			
		||||
        hasLoopArrow = false,
 | 
			
		||||
        initialExtent = this.extent();
 | 
			
		||||
        hasLoopArrow = false;
 | 
			
		||||
 | 
			
		||||
    if ((this instanceof MultiArgMorph) && (this.slotSpec !== '%cs')) {
 | 
			
		||||
        blockWidth += this.arrows().width();
 | 
			
		||||
| 
						 | 
				
			
			@ -2054,35 +2052,12 @@ SyntaxElementMorph.prototype.fixLayout = function () {
 | 
			
		|||
    }
 | 
			
		||||
 | 
			
		||||
    // find out if one of my parents needs to be fixed
 | 
			
		||||
    if (this instanceof CommandBlockMorph) {
 | 
			
		||||
        if (this.height() !== initialExtent.y) {
 | 
			
		||||
            affected = this.parentThatIsA(CommandSlotMorph, ReporterSlotMorph);
 | 
			
		||||
            if (affected) {
 | 
			
		||||
                affected.fixLayout();
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        if (this.width() !== initialExtent.x) {
 | 
			
		||||
            affected = this.parentThatIsA(
 | 
			
		||||
                ReporterBlockMorph,
 | 
			
		||||
                CommandSlotMorph,
 | 
			
		||||
                RingCommandSlotMorph,
 | 
			
		||||
                ReporterSlotMorph
 | 
			
		||||
            );
 | 
			
		||||
            if (affected) {
 | 
			
		||||
                affected.fixLayout();
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        if (affected) {
 | 
			
		||||
            return;
 | 
			
		||||
        }
 | 
			
		||||
    } else if (this instanceof ReporterBlockMorph) {
 | 
			
		||||
        if (this.parent && this.parent.fixLayout) {
 | 
			
		||||
            this.parent.fixLayout();
 | 
			
		||||
            this.parent.changed();
 | 
			
		||||
            return;
 | 
			
		||||
        }
 | 
			
		||||
    if (this instanceof BlockMorph && this.parent && this.parent.fixLayout) {
 | 
			
		||||
        this.parent.fixLayout();
 | 
			
		||||
        this.parent.changed();
 | 
			
		||||
        return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    
 | 
			
		||||
    this.fixHighlight();
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Ładowanie…
	
		Reference in New Issue