Attachment #210612 for bug #370756

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 370756
Collapse All | Expand All




/*******************************************************************************
 * Copyright (c) 2011, 2012 Frank Appel and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

  }

  private void forceShellRecalculations( Shell shell ) {
    boolean isPacked = ControlUtil.getControlAdapter( shell ).isPacked();
    Rectangle boundsBuffer = shell.getBounds();
    bufferScrolledCompositeOrigins( shell );
    clearLayoutBuffers( shell );

    rePack( shell );
    enlargeScrolledCompositeContent( shell );
    clearLayoutBuffers( shell );
    restoreShellSize( shell, boundsBuffer, isPacked );
    restoreScrolledCompositeOrigins( shell );
  }


    WidgetTreeVisitor.accept( shell, new RestoreScrolledCompositeOriginsVisitor() );
  }

  private void restoreShellSize( Shell shell, Rectangle bufferedBounds, boolean isPacked ) {
    if( isPacked ) {
      shell.pack();
    } else {
      setShellSize( shell, bufferedBounds );
    }
  }

  private void enlargeShell( Shell shell ) {




/*******************************************************************************
 * Copyright (c) 2011, 2012 Frank Appel and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

    assertFalse( ControlUtil.getControlAdapter( control ).isPacked() );
  }

  public void testShellRePackTookPlace() {
    shell.pack();
    turnOnImmediateResizeEventHandling();
    fakeMeasurementResults();
    TextSizeRecalculation recalculation = new TextSizeRecalculation();

    recalculation.execute();

    assertTrue( ControlUtil.getControlAdapter( shell ).isPacked() );
  }

  public void testLayoutOfCompositeWithFixedSize() {
    turnOnImmediateResizeEventHandling();
    createShellWithLayout();

Return to bug 370756

Lines 1-5 Link Here

(-)src/org/eclipse/rwt/internal/textsize/TextSizeRecalculation.java (-4 / +9 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2011 Frank Appel and others.	2	* Copyright (c) 2011, 2012 Frank Appel and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 31-36 Link Here
31	}	31	}
32		32
33	private void forceShellRecalculations( Shell shell ) {	33	private void forceShellRecalculations( Shell shell ) {
		34	boolean isPacked = ControlUtil.getControlAdapter( shell ).isPacked();
34	Rectangle boundsBuffer = shell.getBounds();	35	Rectangle boundsBuffer = shell.getBounds();
35	bufferScrolledCompositeOrigins( shell );	36	bufferScrolledCompositeOrigins( shell );
36	clearLayoutBuffers( shell );	37	clearLayoutBuffers( shell );
Lines 39-45 Link Here
39	rePack( shell );	40	rePack( shell );
40	enlargeScrolledCompositeContent( shell );	41	enlargeScrolledCompositeContent( shell );
41	clearLayoutBuffers( shell );	42	clearLayoutBuffers( shell );
42	restoreShellSize( shell, boundsBuffer );	43	restoreShellSize( shell, boundsBuffer, isPacked );
43	restoreScrolledCompositeOrigins( shell );	44	restoreScrolledCompositeOrigins( shell );
44	}	45	}
45		46
Lines 67-74 Link Here
67	WidgetTreeVisitor.accept( shell, new RestoreScrolledCompositeOriginsVisitor() );	68	WidgetTreeVisitor.accept( shell, new RestoreScrolledCompositeOriginsVisitor() );
68	}	69	}
69		70
70	private void restoreShellSize( Shell shell, Rectangle bufferedBounds ) {	71	private void restoreShellSize( Shell shell, Rectangle bufferedBounds, boolean isPacked ) {
71	setShellSize( shell, bufferedBounds );	72	if( isPacked ) {
		73	shell.pack();
		74	} else {
		75	setShellSize( shell, bufferedBounds );
		76	}
72	}	77	}
73		78
74	private void enlargeShell( Shell shell ) {	79	private void enlargeShell( Shell shell ) {