Attachment #202170 for bug #355709

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 355709
Collapse All | Expand All




/*******************************************************************************
 * Copyright (c) 2011 EclipseSource 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    EclipseSource - initial API and implementation
 ******************************************************************************/
package org.eclipse.rwt.internal.textsize;

import org.eclipse.swt.internal.widgets.ICompositeAdapter;
import org.eclipse.swt.internal.widgets.WidgetTreeVisitor.AllWidgetTreeVisitor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Widget;


class MarkLayoutNeededVisitor extends AllWidgetTreeVisitor {

  public boolean doVisit( Widget widget ) {
    if( widget instanceof Composite ) {
      Composite composite = ( Composite )widget;
      getAdapter( composite ).markLayoutNeeded();
    }
    return true;
  }

  private static ICompositeAdapter getAdapter( Composite composite ) {
    Object adapter = composite.getAdapter( ICompositeAdapter.class );
    return ( ICompositeAdapter )adapter;
  }
}

Lines 33-38 Link Here

(-)src/org/eclipse/rwt/internal/textsize/TextSizeRecalculation.java (-2 / +7 lines)
33	Rectangle boundsBuffer = shell.getBounds();	33	Rectangle boundsBuffer = shell.getBounds();
34	bufferScrolledCompositeOrigins( shell );	34	bufferScrolledCompositeOrigins( shell );
35	clearLayoutBuffers( shell );	35	clearLayoutBuffers( shell );
		36	markLayoutNeeded( shell );
36	enlargeShell( shell );	37	enlargeShell( shell );
37	rePackControls( shell );	38	rePackControls( shell );
38	enlargeScrolledCompositeContent( shell );	39	enlargeScrolledCompositeContent( shell );
Lines 49-54 Link Here
49	WidgetTreeVisitor.accept( shell, new ClearLayoutBuffersVisitor() );	50	WidgetTreeVisitor.accept( shell, new ClearLayoutBuffersVisitor() );
50	}	51	}
51		52
		53	private void markLayoutNeeded( Shell shell ) {
		54	WidgetTreeVisitor.accept( shell, new MarkLayoutNeededVisitor() );
		55	}
		56
52	private void bufferScrolledCompositeOrigins( Shell shell ) {	57	private void bufferScrolledCompositeOrigins( Shell shell ) {
53	WidgetTreeVisitor.accept( shell, new BufferScrolledCompositeOriginsVisitor() );	58	WidgetTreeVisitor.accept( shell, new BufferScrolledCompositeOriginsVisitor() );
54	}	59	}
Lines 60-66 Link Here
60	private void restoreScrolledCompositeOrigins( Shell shell ) {	65	private void restoreScrolledCompositeOrigins( Shell shell ) {
61	WidgetTreeVisitor.accept( shell, new RestoreScrolledCompositeOriginsVisitor() );	66	WidgetTreeVisitor.accept( shell, new RestoreScrolledCompositeOriginsVisitor() );
62	}	67	}
63		68
64	private void restoreShellSize( Shell shell, Rectangle bufferedBounds ) {	69	private void restoreShellSize( Shell shell, Rectangle bufferedBounds ) {
65	setShellSize( shell, bufferedBounds );	70	setShellSize( shell, bufferedBounds );
66	}	71	}
Lines 87-93 Link Here
87	IDisplayAdapter displayAdapter = ( IDisplayAdapter )adapter;	92	IDisplayAdapter displayAdapter = ( IDisplayAdapter )adapter;
88	return displayAdapter.getShells();	93	return displayAdapter.getShells();
89	}	94	}
90		95
91	private void setShellSize( Shell shell, Rectangle bounds ) {	96	private void setShellSize( Shell shell, Rectangle bounds ) {
92	getShellAdapter( shell ).setBounds( bounds );	97	getShellAdapter( shell ).setBounds( bounds );
93	}	98	}




/*******************************************************************************
 * Copyright (c) 2011 EclipseSource 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    EclipseSource - initial API and implementation
 ******************************************************************************/
package org.eclipse.swt.internal.widgets;


public interface ICompositeAdapter {

  void markLayoutNeeded();

}

Lines 15-20 Link Here

(-)src/org/eclipse/swt/widgets/Composite.java (-1 / +23 lines)
15	import org.eclipse.swt.SWT;	15	import org.eclipse.swt.SWT;
16	import org.eclipse.swt.graphics.Point;	16	import org.eclipse.swt.graphics.Point;
17	import org.eclipse.swt.graphics.Rectangle;	17	import org.eclipse.swt.graphics.Rectangle;
		18	import org.eclipse.swt.internal.SerializableCompatibility;
		19	import org.eclipse.swt.internal.widgets.ICompositeAdapter;
18	import org.eclipse.swt.widgets.ControlHolder.IControlHolderAdapter;	20	import org.eclipse.swt.widgets.ControlHolder.IControlHolderAdapter;
19		21
20	/**	22	/**
Lines 34-39 Link Here
34	*/	36	*/
35	public class Composite extends Scrollable {	37	public class Composite extends Scrollable {
36		38
		39	private final ICompositeAdapter compositeAdapter;
37	private Layout layout;	40	private Layout layout;
38	int layoutCount;	41	int layoutCount;
39	private final ControlHolder controlHolder;	42	private final ControlHolder controlHolder;
Lines 44-49 Link Here
44	// prevent instantiation from outside this package	47	// prevent instantiation from outside this package
45	super( parent );	48	super( parent );
46	controlHolder = new ControlHolder();	49	controlHolder = new ControlHolder();
		50	compositeAdapter = new CompositeAdapter();
47	}	51	}
48		52
49	/**	53	/**
Lines 76-81 Link Here
76	public Composite( Composite parent, int style ) {	80	public Composite( Composite parent, int style ) {
77	super( parent, style );	81	super( parent, style );
78	controlHolder = new ControlHolder();	82	controlHolder = new ControlHolder();
		83	compositeAdapter = new CompositeAdapter();
79	}	84	}
80		85
81	void initState() {	86	void initState() {
Lines 114-119 Link Here
114	Object result;	119	Object result;
115	if( adapter == IControlHolderAdapter.class ) {	120	if( adapter == IControlHolderAdapter.class ) {
116	result = controlHolder;	121	result = controlHolder;
		122	} else if( adapter == ICompositeAdapter.class ) {
		123	result = compositeAdapter;
117	} else {	124	} else {
118	result = super.getAdapter( adapter );	125	result = super.getAdapter( adapter );
119	}	126	}
Lines 832-838 Link Here
832	void notifyResize( Point oldSize ) {	839	void notifyResize( Point oldSize ) {
833	// TODO [rh] revise this: the SWT code (method sendResize) first calls	840	// TODO [rh] revise this: the SWT code (method sendResize) first calls
834	// 'super' (fires resize events) and then does the layouting	841	// 'super' (fires resize events) and then does the layouting
835	if( !oldSize.equals( getSize() ) ) {	842	if( !oldSize.equals( getSize() ) \|\| isLayoutNeeded() ) {
836	ProcessActionRunner.add( new Runnable() {	843	ProcessActionRunner.add( new Runnable() {
837	public void run() {	844	public void run() {
838	if( !isDisposed() && layout != null ) {	845	if( !isDisposed() && layout != null ) {
Lines 845-850 Link Here
845	super.notifyResize( oldSize );	852	super.notifyResize( oldSize );
846	}	853	}
847		854
		855	private boolean isLayoutNeeded() {
		856	return ( state & LAYOUT_NEEDED ) != 0;
		857	}
		858
848	///////////////////	859	///////////////////
849	// Skinning support	860	// Skinning support
850		861
Lines 858-861 Link Here
858	}	869	}
859	}	870	}
860	}	871	}
		872
		873	////////////////
		874	// Inner classes
		875
		876	private final class CompositeAdapter implements ICompositeAdapter, SerializableCompatibility {
		877
		878	public void markLayoutNeeded() {
		879	Composite.this.markLayout( false, false );
		880	}
		881
		882	}
861	}	883	}




 *
 * Contributors:
 *    Frank Appel - initial API and implementation
 *    EclipseSource - ongoing development
 ******************************************************************************/
package org.eclipse.rwt.internal.textsize;


import org.eclipse.swt.events.ControlListener;
import org.eclipse.swt.graphics.*;
import org.eclipse.swt.internal.widgets.ControlUtil;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;



  private static final FontData FONT_DATA = new FontData( "arial", 23, SWT.BOLD );
  private static final String TEXT_TO_MEASURE = "textToMeasure";

  private Display display;
  private Shell shell;
  private Composite scrolledCompositeContent;
  private ResizeListener shellResizeListener;
  private ResizeListener scrolledCompositeContentResizeListener;
  private Label packedControl;
  
  
  private final class ResizeListener implements ControlListener {
    private int resizeCount;
    
    public void controlResized( ControlEvent e ) {
      resizeCount++;
    }

  protected void setUp() throws Exception {
    Fixture.setUp();
    display = new Display();
    shell = new Shell( display );
  }

  protected void tearDown() throws Exception {
    Fixture.tearDown();
    }
  }

 
  public void testExecute() {
    createWidgetTree();
    registerResizeListeners();
    turnOnImmediateResizeEventHandling();
    fakeMeasurementResults();
    TextSizeRecalculation recalculation = new TextSizeRecalculation();

    recalculation.execute();

    checkResizeTookPlace();
    checkRePackTookPlace();
  }

  public void testIControlAdapterIsPacked() {
    Display display = new Display();
    Shell control = new Shell( display );
    assertFalse( ControlUtil.getControlAdapter( control ).isPacked() );

    control.pack();
    assertTrue( ControlUtil.getControlAdapter( control ).isPacked() );

    control.setBounds( new Rectangle( 1, 1, 2, 2 ) );
    assertFalse( ControlUtil.getControlAdapter( control ).isPacked() );
  }

  public void testLayoutOfCompositeWithFixedSize() {
    turnOnImmediateResizeEventHandling();
    createShellWithLayout();
    Composite fixedSizeComposite = createFixedSizeComposite();
    Label label = new Label( fixedSizeComposite, SWT.NONE );
    label.setText( "text" );
    shell.pack();
    // simulate smaller size because of text estimation
    label.setSize( 5, 5 );
    ResizeListener resizeListener = new ResizeListener();
    label.addControlListener( resizeListener );

    TextSizeRecalculation recalculation = new TextSizeRecalculation();
    recalculation.execute();

    assertEquals( 1, resizeListener.resizeCount() );
  }

  private void checkResizeTookPlace() {

    assertEquals( 2, shellResizeListener.resizeCount() );
    assertEquals( 2, scrolledCompositeContentResizeListener.resizeCount() );
  }

  private void checkRePackTookPlace() {
    assertEquals( new Point( 100, 22 ), packedControl.getSize() );
  }

  }

  private void createWidgetTree() {
    createShellWithLayout();
    createShellWithLayout( display );
    createScrolledCompositeWithContent();
    createPackedControl();
  }

    scrolledComposite.setContent( scrolledCompositeContent );
  }

  private void createShellWithLayout() {
    shell.setLayout( new GridLayout() );
  }

  private Composite createFixedSizeComposite() {
    Composite result = new Composite( shell, SWT.NONE );
    result.setLayout( new GridLayout() );
    result.setLayoutData( new GridData( 200, SWT.DEFAULT ) );
    return result;
  }

  private void registerResizeListeners() {

    shell.addControlListener( shellResizeListener );
    scrolledCompositeContent.addControlListener( scrolledCompositeContentResizeListener );
  }

  private void turnOnImmediateResizeEventHandling() {
    Fixture.fakePhase( PhaseId.PROCESS_ACTION );
  }

    RWTFactory.getTextSizeStorage().storeFont( FONT_DATA );
    TextSizeStorageUtil.store( FONT_DATA, TEXT_TO_MEASURE, 0, new Point( 100, 20 ) );
  }

  private final class ResizeListener implements ControlListener {
    private int resizeCount;

    public void controlResized( ControlEvent e ) {
      resizeCount++;
    }

    public void controlMoved( ControlEvent e ) {
    }

    public int resizeCount() {
      return resizeCount;
    }
  }

}

Return to bug 355709

Added Link Here

(-)src/org/eclipse/rwt/internal/textsize/MarkLayoutNeededVisitor.java (+33 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 EclipseSource and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* EclipseSource - initial API and implementation
10	******************************************************************************/
11	package org.eclipse.rwt.internal.textsize;
12
13	import org.eclipse.swt.internal.widgets.ICompositeAdapter;
14	import org.eclipse.swt.internal.widgets.WidgetTreeVisitor.AllWidgetTreeVisitor;
15	import org.eclipse.swt.widgets.Composite;
16	import org.eclipse.swt.widgets.Widget;
17
18
19	class MarkLayoutNeededVisitor extends AllWidgetTreeVisitor {
20
21	public boolean doVisit( Widget widget ) {
22	if( widget instanceof Composite ) {
23	Composite composite = ( Composite )widget;
24	getAdapter( composite ).markLayoutNeeded();
25	}
26	return true;
27	}
28
29	private static ICompositeAdapter getAdapter( Composite composite ) {
30	Object adapter = composite.getAdapter( ICompositeAdapter.class );
31	return ( ICompositeAdapter )adapter;
32	}
33	}

Added Link Here

(-)src/org/eclipse/swt/internal/widgets/ICompositeAdapter.java (+18 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 EclipseSource and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* EclipseSource - initial API and implementation
10	******************************************************************************/
11	package org.eclipse.swt.internal.widgets;
12
13
14	public interface ICompositeAdapter {
15
16	void markLayoutNeeded();
17
18	}