Attachment 210830 Details for Bug 369470 – Patch that fixes the issue and updates test cases

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

[patch] Patch that fixes the issue and updates test cases

patch.txt (text/plain), 2.07 KB, created by Austin Riddle

on 2012-02-09 17:38:26 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Austin Riddle

Created: 2012-02-09 17:38:26 EST

Size: 2.07 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/swt/widgets/Tree.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Tree.java,v
>retrieving revision 1.104
>diff -u -r1.104 Tree.java
>--- src/org/eclipse/swt/widgets/Tree.java	6 Feb 2012 12:02:40 -0000	1.104
>+++ src/org/eclipse/swt/widgets/Tree.java	9 Feb 2012 22:37:39 -0000
>@@ -1781,7 +1781,7 @@
>   }
> 
>   int getTextWidth( int index ) {
>-    int result = getCellWidth( index ) - getTextOffset( index );
>+    int result = getCellWidth( index ) - getTextOffset( index ) - getCellPadding().width;
>     if( isTreeColumn( index ) ) {
>       result -= ( TEXT_MARGIN.width - TEXT_MARGIN.x );
>     }
>#P org.eclipse.rap.rwt.test
>Index: src/org/eclipse/swt/internal/widgets/treekit/TreeLCA_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test/src/org/eclipse/swt/internal/widgets/treekit/TreeLCA_Test.java,v
>retrieving revision 1.23
>diff -u -r1.23 TreeLCA_Test.java
>--- src/org/eclipse/swt/internal/widgets/treekit/TreeLCA_Test.java	17 Jan 2012 15:10:34 -0000	1.23
>+++ src/org/eclipse/swt/internal/widgets/treekit/TreeLCA_Test.java	9 Feb 2012 22:37:39 -0000
>@@ -214,7 +214,7 @@
>     item1.setText( "item" );
>     item1.setImage( image );
>     ItemMetrics[] metrics = TreeLCA.getItemMetrics( tree );
>-    assertEquals( 69, metrics[ 0 ].textWidth );
>+    assertEquals( 57, metrics[ 0 ].textWidth );
>   }
> 
>   public void testPreserveValues() {
>@@ -751,7 +751,7 @@
> 
>     Message message = Fixture.getProtocolMessage();
>     JSONArray actual = ( JSONArray )message.findSetProperty( tree, "itemMetrics" );
>-    assertTrue( ProtocolTestUtil.jsonEquals( "[0,0,50,0,0,3,42]", ( JSONArray )actual.get( 0 ) ) );
>+    assertTrue( ProtocolTestUtil.jsonEquals( "[0,0,50,0,0,3,30]", ( JSONArray )actual.get( 0 ) ) );
>   }
> 
>   public void testRenderItemMetricsUnchanged() throws IOException {

Actions: View | Diff

Attachments on bug 369470: 210700 | 210830