Attachment 182622 Details for Bug 327513 – Proposed fix

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

[patch] Proposed fix

Bug-327513.patch (text/plain), 4.35 KB, created by Ivan Furnadjiev

on 2010-11-08 10:23:01 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2010-11-08 10:23:01 EST

Size: 4.35 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/swt/widgets/TabFolder.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TabFolder.java,v
>retrieving revision 1.17
>diff -u -r1.17 TabFolder.java
>--- src/org/eclipse/swt/widgets/TabFolder.java	8 Apr 2010 18:49:01 -0000	1.17
>+++ src/org/eclipse/swt/widgets/TabFolder.java	8 Nov 2010 15:10:20 -0000
>@@ -47,9 +47,11 @@
> public class TabFolder extends Composite {
> 
>   private static final TabItem[] EMPTY_TAB_ITEMS = new TabItem[ 0 ];
>+  private static final int TAB_BAR_HEIGHT = 23;
> 
>   private final ItemHolder itemHolder = new ItemHolder( TabItem.class );
>   private int selectionIndex = -1;
>+  private boolean onBottom;
> 
>   /**
>    * Constructs a new instance of this class given its parent
>@@ -81,6 +83,7 @@
>    */
>   public TabFolder( final Composite parent, final int style ) {
>     super( parent, checkStyle( style ) );
>+    onBottom = ( super.getStyle() & SWT.BOTTOM ) != 0;
>   }
> 
>   void initState() {
>@@ -385,11 +388,26 @@
>     int width = bounds.width;
>     int height = bounds.height;
>     int border = 1;
>-    int hTabBar = 23;
>+    int hTabBar = onBottom ? 0 : TAB_BAR_HEIGHT;
>     return new Rectangle( border,
>                           hTabBar + border,
>                           width - border * 2,
>-                          height - ( hTabBar + border * 2 ) );
>+                          height - ( TAB_BAR_HEIGHT + border * 2 ) );
>+  }
>+
>+  public Rectangle computeTrim( final int x,
>+                                final int y,
>+                                final int width,
>+                                final int height )
>+  {
>+    checkWidget();
>+    int border = 1;
>+    int hTabBar = onBottom ? 0 : TAB_BAR_HEIGHT;
>+    int trimX = x - border;
>+    int trimWidth = width + 2 * border;
>+    int trimY = y - border - hTabBar;
>+    int trimHeight = height + 2 * border + TAB_BAR_HEIGHT;
>+    return new Rectangle( trimX, trimY, trimWidth, trimHeight );
>   }
> 
>   public Point computeSize( final int wHint,
>#P org.eclipse.rap.rwt.q07
>Index: src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA.java,v
>retrieving revision 1.7
>diff -u -r1.7 TabFolderLCA.java
>--- src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA.java	18 Feb 2010 13:01:01 -0000	1.7
>+++ src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA.java	8 Nov 2010 15:10:21 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002, 2008 Innoopract Informationssysteme GmbH.
>+ * Copyright (c) 2002, 2010 Innoopract Informationssysteme GmbH.
>  * 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
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  *     Innoopract Informationssysteme GmbH - initial API and implementation
>+ *     EclipseSource - ongoing development
>  ******************************************************************************/
> 
> package org.eclipse.swt.internal.widgets.tabfolderkit;
>@@ -40,7 +41,7 @@
>     writer.set( "hideFocus", true );
>     if( ( tabFolder.getStyle() & SWT.BOTTOM ) != 0 ) {
>       writer.set( "placeBarOnTop", false );
>-    }    
>+    }
>     ControlLCAUtil.writeStyleFlags( tabFolder );
>     writer.addListener( "keypress",
>                         "org.eclipse.swt.TabUtil.onTabFolderKeyPress" );
>@@ -61,10 +62,13 @@
>   public Rectangle adjustCoordinates( final Widget widget,
>                                       final Rectangle newBounds )
>   {
>+    Control control = ( Control )widget;
>+    TabFolder tabFolder = ( TabFolder )control.getParent();
>+    boolean onBottom = ( tabFolder.getStyle() & SWT.BOTTOM ) != 0;
>     int border = 1;
>-    int hTabBar = 23;
>+    int hTabBar = onBottom ? 0 : 23;
>     return new Rectangle( newBounds.x - border - 10,
>-                          newBounds.y - hTabBar - border -10,
>+                          newBounds.y - hTabBar - border - 10,
>                           newBounds.width,
>                           newBounds.height );
>   }

Actions: View | Diff

Attachments on bug 327513: 182622