- * The current version of the {@link StyledCellLabelProvider} will ignore all font settings on - * {@link StyleRange}. Different fonts would make labels wider, and the native - * selection drawing could not be reused. - *
- * - *NOTE: This API is experimental and may be deleted or - * changed before 3.4 is released.
* * @since 3.4 */ @@ -75,6 +68,9 @@ private ColumnViewer viewer; private ViewerColumn column; + + private Widget itemOfLastMeasure; + private int deltaOfLastMeasure; /** * Creates a new StyledCellLabelProvider. By default, owner draw is enabled, focus is drawn and no @@ -200,8 +196,6 @@ int orientation = viewer.getControl().getStyle() & (SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT); cachedTextLayout = new TextLayout(display); cachedTextLayout.setOrientation(orientation); - } else { - cachedTextLayout.setText(""); // make sure no previous ranges are cleared //$NON-NLS-1$ } return cachedTextLayout; } @@ -215,37 +209,6 @@ return (event.detail & SWT.FOCUSED) != 0 && (this.style & NO_FOCUS) == 0; } - - /** - * Returns a {@link TextLayout} instance for the given cell - * configured with the style ranges. The text layout instance is managed by - * the label provider. Caller of the method must not dispose the text - * layout. - * - * @param diplay - * the current display - * @param applyColors - * if set, create colors in the result - * @param cell - * the viewer cell - * @return a TextLayout instance - */ - private TextLayout getTextLayoutForInfo(Display display, ViewerCell cell, boolean applyColors) { - TextLayout layout = getSharedTextLayout(display); - - layout.setText(cell.getText()); - layout.setFont(cell.getFont()); // set also if null to clear previous usages - - StyleRange[] styleRanges = cell.getStyleRanges(); - if (styleRanges != null) { // user didn't fill styled ranges - for (int i = 0; i < styleRanges.length; i++) { - StyleRange curr = prepareStyleRange(styleRanges[i], applyColors); - layout.setStyle(curr, curr.start, curr.start + curr.length - 1); - } - } - - return layout; - } /** * Prepares the given style range before it is applied to the label. This method makes sure that @@ -263,10 +226,8 @@ protected StyleRange prepareStyleRange(StyleRange styleRange, boolean applyColors) { // if no colors apply or font is set, create a clone and clear the // colors and font - if (styleRange.font != null || !applyColors - && (styleRange.foreground != null || styleRange.background != null)) { + if (!applyColors && (styleRange.foreground != null || styleRange.background != null)) { styleRange = (StyleRange) styleRange.clone(); - styleRange.font = null; // ignore font settings until bug 168807 is resolved if (!applyColors) { styleRange.foreground = null; styleRange.background = null; @@ -305,7 +266,53 @@ * java.lang.Object) */ protected void measure(Event event, Object element) { - // use native measuring + if (!isOwnerDrawEnabled()) + return; + + ViewerCell cell= getViewerCell(event, element); + boolean applyColors = useColors(event); // returns false because of bug 228376 + + TextLayout layout = getSharedTextLayout(event.display); + + int textWidthDelta = deltaOfLastMeasure = updateTextLayout(layout, cell, applyColors); + /* remove-begin if bug 228695 fixed */ + itemOfLastMeasure = event.item; + /* remove-end if bug 228695 fixed */ + + event.width += textWidthDelta; + } + + /** + * @param layout + * @param cell + * @param applyColors + * @return the text width delta (0 if the text layout contains no other font) + */ + private int updateTextLayout(TextLayout layout, ViewerCell cell, + boolean applyColors) { + layout.setText(""); //$NON-NLS-1$ //make sure all previous ranges are cleared (see bug 226090) + + layout.setText(cell.getText()); + layout.setFont(cell.getFont()); // set also if null to clear previous usages + + int originalTextWidth = layout.getBounds().width; // text width without any styles + boolean containsOtherFont= false; + + StyleRange[] styleRanges = cell.getStyleRanges(); + if (styleRanges != null) { // user didn't fill styled ranges + for (int i = 0; i < styleRanges.length; i++) { + StyleRange curr = prepareStyleRange(styleRanges[i], applyColors); + layout.setStyle(curr, curr.start, curr.start + curr.length - 1); + if (curr.font != null) { + containsOtherFont= true; + } + } + } + int textWidthDelta = 0; + if (containsOtherFont) { + textWidthDelta = layout.getBounds().width - originalTextWidth; + } + return textWidthDelta; } /* @@ -321,6 +328,7 @@ ViewerCell cell= getViewerCell(event, element); boolean applyColors = useColors(event); + GC gc = event.gc; // remember colors to restore the GC later Color oldForeground = gc.getForeground(); @@ -337,7 +345,6 @@ gc.setBackground(background); } } - Image image = cell.getImage(); if (image != null) { Rectangle imageBounds = cell.getImageBounds(); @@ -353,10 +360,31 @@ } } - TextLayout textLayout = getTextLayoutForInfo(event.display, cell, applyColors); - Rectangle textBounds = cell.getTextBounds(); if (textBounds != null) { + TextLayout textLayout= getSharedTextLayout(event.display); + + /* remove-begin if bug 228695 fixed */ + if (event.item != itemOfLastMeasure) { + // fLayout has not been configured in 'measure()' + deltaOfLastMeasure = updateTextLayout(textLayout, cell, applyColors); + itemOfLastMeasure = event.item; + } + /* remove-end if bug 228695 fixed */ + + /* remove-begin if bug 228376 fixed */ + if (!applyColors) { + // need to remove colors for selected elements: measure doesn't provide that information, see bug 228376 + StyleRange[] styleRanges= cell.getStyleRanges(); + if (styleRanges != null) { + for (int i= 0; i < styleRanges.length; i++) { + StyleRange curr = prepareStyleRange(styleRanges[i], applyColors); + textLayout.setStyle(curr, curr.start, curr.start + curr.length - 1); + } + } + } + /* remove-end if bug 228376 fixed */ + Rectangle layoutBounds = textLayout.getBounds(); int x = textBounds.x; @@ -368,7 +396,7 @@ if (drawFocus(event)) { Rectangle focusBounds = cell.getViewerRow().getBounds(); - gc.drawFocus(focusBounds.x, focusBounds.y, focusBounds.width, + gc.drawFocus(focusBounds.x, focusBounds.y, focusBounds.width + deltaOfLastMeasure, focusBounds.height); } Index: src/org/eclipse/jface/preference/PreferenceManager.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/preference/PreferenceManager.java,v retrieving revision 1.15 diff -u -r1.15 PreferenceManager.java --- src/org/eclipse/jface/preference/PreferenceManager.java 10 Mar 2008 03:47:54 -0000 1.15 +++ src/org/eclipse/jface/preference/PreferenceManager.java 27 Nov 2008 18:09:51 -0000 @@ -12,6 +12,8 @@ package org.eclipse.jface.preference; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; import java.util.List; import java.util.StringTokenizer; @@ -129,6 +131,7 @@ sequence.add(node); } IPreferenceNode[] subnodes = node.getSubNodes(); + sort(subnodes); for (int i = 0; i < subnodes.length; i++) { buildSequence(subnodes[i], sequence, order); } @@ -189,6 +192,8 @@ "invalid traversal order");//$NON-NLS-1$ ArrayList sequence = new ArrayList(); IPreferenceNode[] subnodes = getRoot().getSubNodes(); + sort(subnodes); + for (int i = 0; i < subnodes.length; i++) { buildSequence(subnodes[i], sequence, order); } @@ -196,6 +201,26 @@ } /** + * Sorts the given nodes by ID. This is required because we no longer + * populate this manager with a sorted list of elements. This is to provide + * backwards compatability in {@link #getElements(int)}. + * + * @param nodes + * the nodes to sort. + * @since 3.4 + */ + private void sort(IPreferenceNode[] nodes) { + Arrays.sort(nodes, new Comparator() { + + public int compare(Object o1, Object o2) { + IPreferenceNode n1 = (IPreferenceNode) o1; + IPreferenceNode n2 = (IPreferenceNode) o2; + return n1.getLabelText().compareTo(n2.getLabelText()); + } + }); + } + + /** * Returns the root node. * Note that the root node is a special internal node * that is used to collect together all the nodes that