Attachment 170496 Details for Bug 314653 – Solution

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

[patch] Solution

bug314653.patch (text/plain), 4.67 KB, created by Holger Staudacher

on 2010-05-31 05:25:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Holger Staudacher

Created: 2010-05-31 05:25:34 EDT

Size: 4.67 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.design.example
>Index: src/org/eclipse/rap/internal/design/example/builder/StackPresentationBuider.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.design.example/src/org/eclipse/rap/internal/design/example/builder/StackPresentationBuider.java,v
>retrieving revision 1.3
>diff -u -r1.3 StackPresentationBuider.java
>--- src/org/eclipse/rap/internal/design/example/builder/StackPresentationBuider.java	15 Oct 2009 14:54:06 -0000	1.3
>+++ src/org/eclipse/rap/internal/design/example/builder/StackPresentationBuider.java	31 May 2010 09:24:29 -0000
>@@ -142,7 +142,7 @@
>     left.setBackgroundImage( borderLeft );
>     FormData fdLeft = new FormData();
>     left.setLayoutData( fdLeft );
>-    fdLeft.top = new FormAttachment( 0, borderTop.getBounds().height - 1 );
>+    fdLeft.top = new FormAttachment( 0, borderTop.getBounds().height );
>     fdLeft.bottom 
>       = new FormAttachment( 100, - borderBottom.getBounds().height + 1 );
>     fdLeft.left = new FormAttachment( 0 );
>@@ -154,7 +154,7 @@
>     right.setBackgroundImage( borderRight );
>     FormData fdRight = new FormData();
>     right.setLayoutData( fdRight );
>-    fdRight.top = new FormAttachment( 0, borderTop.getBounds().height - 1 );
>+    fdRight.top = new FormAttachment( 0, borderTop.getBounds().height );
>     fdRight.bottom 
>       = new FormAttachment( 100, - borderBottom.getBounds().height + 1 );
>     fdRight.right = new FormAttachment( 100 );
>Index: src/org/eclipse/rap/internal/design/example/fancy/FancyWindowComposer.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.design.example/src/org/eclipse/rap/internal/design/example/fancy/FancyWindowComposer.java,v
>retrieving revision 1.5
>diff -u -r1.5 FancyWindowComposer.java
>--- src/org/eclipse/rap/internal/design/example/fancy/FancyWindowComposer.java	30 Mar 2010 08:46:34 -0000	1.5
>+++ src/org/eclipse/rap/internal/design/example/fancy/FancyWindowComposer.java	31 May 2010 09:24:29 -0000
>@@ -96,7 +96,7 @@
>     FormData fdPage = new FormData();
>     page.setLayoutData( fdPage );
>     fdPage.left = new FormAttachment( 0, 7 );
>-    fdPage.top = new FormAttachment( 0, -7 );
>+    fdPage.top = new FormAttachment( 0, -5 );
>     fdPage.right = new FormAttachment( 100, -7 );
>         
>     // create Footer and attach the page
>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.25
>diff -u -r1.25 ViewStackPresentation.java
>--- src/org/eclipse/rap/internal/design/example/stacks/ViewStackPresentation.java	20 May 2010 15:46:54 -0000	1.25
>+++ src/org/eclipse/rap/internal/design/example/stacks/ViewStackPresentation.java	31 May 2010 09:24:29 -0000
>@@ -242,15 +242,22 @@
>       Label title = new Label( tabBg, SWT.NONE );
>       title.setData( WidgetUtil.CUSTOM_VARIANT, "standaloneView" );
>       title.setText( newPart.getName() );
>+      hideFrameLabel( StackPresentationBuider.TOP_BORDER );      
>     } else {
>       getTabBar().setVisible( false );
>-      Object labelMap = stackBuilder.getAdapter( Map.class );
>-      if( labelMap != null && ( labelMap instanceof Map )  ) {
>-        Map map = ( Map ) labelMap;
>-        Label left = ( Label ) map.get( StackPresentationBuider.LEFT );
>-        Label right = ( Label ) map.get( StackPresentationBuider.RIGHT );
>-        left.setVisible( false );
>-        right.setVisible( false );
>+      hideFrameLabel( StackPresentationBuider.LEFT );
>+      hideFrameLabel( StackPresentationBuider.RIGHT );
>+    }
>+  }
>+  
>+  private void hideFrameLabel( final String id ) {
>+    Object labelMap = stackBuilder.getAdapter( Map.class );
>+    if( labelMap != null && ( labelMap instanceof Map )  ) {
>+      Map map = ( Map ) labelMap;
>+      Object object = map.get( id );
>+      if( object != null ) {
>+        Label frameLabel = ( Label)object;
>+        frameLabel.setVisible( false );
>       }
>     }
>   }
>@@ -1143,7 +1150,7 @@
>         int height = topBorderImg.getBounds().height;
>         FormData fdTopBorder = ( FormData ) topBorder.getLayoutData();
>         fdTopBorder.height = height;
>-        fdTopBorder.top = new FormAttachment( 0, 5 );
>+        fdTopBorder.top = new FormAttachment( 0, 7 );
>         FormData fdLeftBorder = ( FormData ) leftBorder.getLayoutData();
>         FormData fdRightBorder = ( FormData ) rightBorder.getLayoutData();
>         fdLeftBorder.top = new FormAttachment( 0, height + 6 );

Flags:

ruediger.herrmann: review+

Actions: View | Diff

Attachments on bug 314653: 170496