### Eclipse Workspace Patch 1.0 #P org.eclipse.gmf.runtime.diagram.ui Index: src/org/eclipse/gmf/runtime/diagram/ui/tools/TextDirectEditManager.java =================================================================== RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/tools/TextDirectEditManager.java,v retrieving revision 1.12 diff -u -r1.12 TextDirectEditManager.java --- src/org/eclipse/gmf/runtime/diagram/ui/tools/TextDirectEditManager.java 25 May 2006 18:00:56 -0000 1.12 +++ src/org/eclipse/gmf/runtime/diagram/ui/tools/TextDirectEditManager.java 6 Jun 2006 13:21:32 -0000 @@ -98,8 +98,9 @@ rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr*2, 0)); } - if (!rect.equals(new Rectangle(text.getBounds()))) - text.setBounds(rect.x, rect.y, rect.width, rect.height); + org.eclipse.swt.graphics.Rectangle newRect = text.computeTrim(rect.x, rect.y, rect.width, rect.height); + if (!newRect.equals(new Rectangle(text.getBounds()))) + text.setBounds(newRect.x, newRect.y, newRect.width, newRect.height); } } @@ -124,8 +125,9 @@ int avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth(); rect.setSize(new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0)); - if (!rect.equals(new Rectangle(text.getBounds()))) - text.setBounds(rect.x, rect.y, rect.width, rect.height); + org.eclipse.swt.graphics.Rectangle newRect = text.computeTrim(rect.x, rect.y, rect.width, rect.height); + if (!newRect.equals(new Rectangle(text.getBounds()))) + text.setBounds(newRect.x, newRect.y, newRect.width, newRect.height); } }