From f6419b58b5ae08827a0a671bb256d099ca2764e7 Mon Sep 17 00:00:00 2001 From: xwu Date: Mon, 20 May 2013 14:49:46 +0800 Subject: [PATCH] Fix the issue - [OS][SPM] "fx" is not shown completely in new computed column window (LINUX)[58892] --- .../birt/report/designer/internal/ui/util/UIUtil.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/UI/org.eclipse.birt.report.designer.ui/src/org/eclipse/birt/report/designer/internal/ui/util/UIUtil.java b/UI/org.eclipse.birt.report.designer.ui/src/org/eclipse/birt/report/designer/internal/ui/util/UIUtil.java index 3369b4a0bca..12175e99529 100644 --- a/UI/org.eclipse.birt.report.designer.ui/src/org/eclipse/birt/report/designer/internal/ui/util/UIUtil.java +++ b/UI/org.eclipse.birt.report.designer.ui/src/org/eclipse/birt/report/designer/internal/ui/util/UIUtil.java @@ -1996,11 +1996,16 @@ public static void setExpressionButtonImage( Button button ) Image image = ReportPlatformUIImages.getImage( imageName ); GridData gd = new GridData( ); - if ( !Platform.getOS( ).equals( Platform.OS_MACOSX ) ) + if ( Platform.getOS( ).equals( Platform.OS_WIN32 ) ) { gd.widthHint = 20; gd.heightHint = 20; } + else + { + gd.widthHint = button.computeSize( SWT.DEFAULT, SWT.DEFAULT ).y; + } + button.setLayoutData( gd ); button.setImage( image ); @@ -2030,10 +2035,11 @@ public static ExpressionButton createExpressionButton( Composite parent, button.setExpressionButtonProvider( provider ); GridData gd = new GridData( ); - if ( !Platform.getOS( ).equals( Platform.OS_MACOSX ) ) + if ( Platform.getOS( ).equals( Platform.OS_WIN32 ) ) { gd.heightHint = 20; } + button.getControl( ).setLayoutData( gd ); return button; }