Attachment 169116 Details for Bug 312271 – new fix

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

[patch] new fix

bug312271.patch (text/plain), 5.47 KB, created by Holger Staudacher

on 2010-05-19 10:15:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Holger Staudacher

Created: 2010-05-19 10:15:58 EDT

Size: 5.47 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.design.example
>Index: src/org/eclipse/rap/internal/design/example/stacks/ViewStackPresentation.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.design.example/src/org/eclipse/rap/internal/design/example/stacks/ViewStackPresentation.java,v
>retrieving revision 1.23
>diff -u -r1.23 ViewStackPresentation.java
>--- src/org/eclipse/rap/internal/design/example/stacks/ViewStackPresentation.java	19 Apr 2010 09:44:37 -0000	1.23
>+++ src/org/eclipse/rap/internal/design/example/stacks/ViewStackPresentation.java	19 May 2010 14:12:46 -0000
>@@ -436,7 +436,6 @@
> 
>       }
>     } );
>-
>     Composite corner = new Composite( buttonArea, SWT.NONE );
>     corner.setData( WidgetUtil.CUSTOM_VARIANT, "compTrans" );
>     corner.setLayout( new FormLayout() );
>@@ -493,7 +492,6 @@
>       buttonArea.setBackground( bg );
>       Control[] children = buttonArea.getChildren();
>       buttonArea.setLayout( new FormLayout() );
>-
>       for( int i = 0; i < children.length; i++ ) {
>         Control child = children[ i ];
>         if( child instanceof Button ) {
>@@ -541,10 +539,17 @@
>         }
>       }
>       buttonArea.getParent().layout();
>+      preventButtonOfOverflow();
>     }
> 
>   }
> 
>+  private void preventButtonOfOverflow() {
>+    if( isOverflowNecessary() ) {
>+      showPartButton( currentPart );
>+    }
>+  } 
>+
>   private void checkHideSeparator( final Composite buttonArea ) {
>     int indexOf = buttonList.indexOf( buttonArea );
>     for( int i = 0; i < buttonList.size(); i++ ) {
>@@ -618,7 +623,6 @@
>       fdTabBg.top = new FormAttachment( 0 );
>       fdTabBg.bottom = new FormAttachment( 100 );
>       createConfArea( fdTabBg );
>-
>       FormData fdLayout
>         = stackBuilder.getPosition( ILayoutSetConstants.STACK_TABBG_POS );
>       RowLayout layout = new RowLayout( SWT.HORIZONTAL );
>@@ -646,10 +650,7 @@
>   }
> 
>   private void manageOverflow() {
>-    int tabChildrenSize = getTabChildrenSize();
>-    if( tabChildrenSize > tabBg.getBounds().width
>-        && moreThanOneChildVisible() )
>-    {
>+    if( isOverflowNecessary() ) {
>       hideLastVisibleButton();
>       manageOverflow();
>     } else {
>@@ -657,6 +658,13 @@
>     }
>     handleOverflowButton();
>   }
>+  
>+  private boolean isOverflowNecessary() {
>+    int tabChildrenSize = getTabChildrenSize();
>+    boolean childrenBiggerThanParent 
>+      = tabChildrenSize > tabBg.getBounds().width;
>+    return childrenBiggerThanParent && moreThanOneChildVisible(); 
>+  }
> 
>   private boolean moreThanOneChildVisible() {
>     boolean result = false;
>@@ -712,13 +720,15 @@
>       Object obj = buttonPartMap.get( overflowButtons.get( i ) );
>       final IPresentablePart part = ( IPresentablePart ) obj;
>       MenuItem item = new MenuItem( overflowMenu, SWT.PUSH );
>-      item.setText( part.getName() );
>-      item.addSelectionListener( new SelectionAdapter() {
>-        public void widgetSelected( final SelectionEvent e ) {
>-          activatePart( part );
>-          showPartButton( part );
>-        };
>-      } );
>+      if( part != null ) {
>+        item.setText( part.getName() );      
>+        item.addSelectionListener( new SelectionAdapter() {
>+          public void widgetSelected( final SelectionEvent e ) {
>+            activatePart( part );
>+            showPartButton( part );
>+          };
>+        } );
>+      }
>     }
>     // show popup
>     overflowButton.setMenu( overflowMenu );
>@@ -808,7 +818,9 @@
>             if( i > 0 ) {
>               children[ i - 1 ].setVisible( false );
>               result = children[ i - 1 ];
>-              overflowButtons.add( children[ i - 1 ] );
>+              if( !overflowButtons.contains( children[ i - 1 ] ) ) {
>+                overflowButtons.add( children[ i - 1 ] );
>+              }
>               children[ i ].moveAbove( children[ i - 1 ] );
>             }
>           } else {
>@@ -817,9 +829,7 @@
>             overflowButtons.add( children[ i ] );
>           }
>           lastChildHidden = true;
>-  
>-          tabBg.layout( true, true );
>-  
>+          tabBg.layout( true, true );  
>         }
>       }
>     }
>@@ -874,7 +884,6 @@
>       fdConfArea.right = new FormAttachment( 100 );
>       fdConfArea.width = 28;
>       fdTabBg.right = new FormAttachment( confArea );
>-
>       confCorner = new Label( confArea, SWT.NONE );
>       Image cornerImage
>         = stackBuilder.getImage( ILayoutSetConstants.STACK_INACTIVE_CORNER );
>@@ -884,7 +893,6 @@
>       fdCorner.left = new FormAttachment( 0 );
>       fdCorner.top = new FormAttachment( 0 );
>       fdCorner.bottom = new FormAttachment( 100 );
>-
>       confButton = new Button( confArea, SWT.PUSH );
>       Image confImage
>         = stackBuilder.getImage( ILayoutSetConstants.STACK_CONF_INACTIVE );
>@@ -923,16 +931,16 @@
> 
>   public Control[] getTabList( final IPresentablePart part ) {
>     ArrayList list = new ArrayList();
>-    if (getControl() != null) {
>-        list.add(getControl());
>+    if( getControl() != null ) {
>+      list.add( getControl() );
>     }
>-    if (part.getToolBar() != null) {
>-        list.add(part.getToolBar());
>+    if( part.getToolBar() != null ) {
>+      list.add( part.getToolBar() );
>     }
>-    if (part.getControl() != null) {
>-        list.add(part.getControl());
>+    if( part.getControl() != null ) {
>+      list.add( part.getControl() );
>     }
>-    return (Control[]) list.toArray(new Control[list.size()]);
>+    return ( Control[] )list.toArray( new Control[ list.size() ] );
>   }
> 
>   public void removePart( final IPresentablePart oldPart ) {

Flags:

b.muskalla: review+

Actions: View | Diff

Attachments on bug 312271: 167721 | 169112 | 169116