Attachment 210612 Details for Bug 370756 – Patch that solves the issue

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

[patch] Patch that solves the issue

Shell_RePack.patch (text/plain), 3.51 KB, created by Ivan Furnadjiev

on 2012-02-06 14:29:39 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2012-02-06 14:29:39 EST

Size: 3.51 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/rwt/internal/textsize/TextSizeRecalculation.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/textsize/TextSizeRecalculation.java,v
>retrieving revision 1.6
>diff -u -r1.6 TextSizeRecalculation.java
>--- src/org/eclipse/rwt/internal/textsize/TextSizeRecalculation.java	14 Oct 2011 16:00:29 -0000	1.6
>+++ src/org/eclipse/rwt/internal/textsize/TextSizeRecalculation.java	6 Feb 2012 17:21:55 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2011 Frank Appel and others.
>+ * 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
>@@ -31,6 +31,7 @@
>   }
> 
>   private void forceShellRecalculations( Shell shell ) {
>+    boolean isPacked = ControlUtil.getControlAdapter( shell ).isPacked();
>     Rectangle boundsBuffer = shell.getBounds();
>     bufferScrolledCompositeOrigins( shell );
>     clearLayoutBuffers( shell );
>@@ -39,7 +40,7 @@
>     rePack( shell );
>     enlargeScrolledCompositeContent( shell );
>     clearLayoutBuffers( shell );
>-    restoreShellSize( shell, boundsBuffer );
>+    restoreShellSize( shell, boundsBuffer, isPacked );
>     restoreScrolledCompositeOrigins( shell );
>   }
> 
>@@ -67,8 +68,12 @@
>     WidgetTreeVisitor.accept( shell, new RestoreScrolledCompositeOriginsVisitor() );
>   }
> 
>-  private void restoreShellSize( Shell shell, Rectangle bufferedBounds ) {
>-    setShellSize( shell, bufferedBounds );
>+  private void restoreShellSize( Shell shell, Rectangle bufferedBounds, boolean isPacked ) {
>+    if( isPacked ) {
>+      shell.pack();
>+    } else {
>+      setShellSize( shell, bufferedBounds );
>+    }
>   }
> 
>   private void enlargeShell( Shell shell ) {
>#P org.eclipse.rap.rwt.test
>Index: src/org/eclipse/rwt/internal/textsize/TextSizeRecalculation_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test/src/org/eclipse/rwt/internal/textsize/TextSizeRecalculation_Test.java,v
>retrieving revision 1.9
>diff -u -r1.9 TextSizeRecalculation_Test.java
>--- src/org/eclipse/rwt/internal/textsize/TextSizeRecalculation_Test.java	24 Nov 2011 19:19:31 -0000	1.9
>+++ src/org/eclipse/rwt/internal/textsize/TextSizeRecalculation_Test.java	6 Feb 2012 17:21:56 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2011 Frank Appel and others.
>+ * 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
>@@ -74,6 +74,17 @@
>     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();

Actions: View | Diff

Attachments on bug 370756: 210612