stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8169719: WrappedPlainView.modelToView() should return Rectangle2D

Browse Source 
Reviewed-by: prr, serb, ssadetsky
This commit is contained in:
Alexander Scherbatiy 2016-11-21 17:46:48 +03:00
parent d1743ce948
commit 9ebdadb0f0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java
View File

@ -26,6 +26,7 @@ package javax.swing.text;
import java.awt.*; import java.awt.*;
import java.awt.font.FontRenderContext; import java.awt.font.FontRenderContext;
import java.awt.geom.Rectangle2D;
import java.lang.ref.SoftReference; import java.lang.ref.SoftReference;
import java.security.AccessController; import java.security.AccessController;
import java.security.PrivilegedAction; import java.security.PrivilegedAction;
@ -750,7 +751,6 @@ public class WrappedPlainView extends BoxView implements TabExpander {
* valid location in the associated document * valid location in the associated document
* @see View#modelToView * @see View#modelToView
*/ */
@SuppressWarnings("deprecation")
public Shape modelToView(int pos, Shape a, Position.Bias b) public Shape modelToView(int pos, Shape a, Position.Bias b)
throws BadLocationException { throws BadLocationException {
Rectangle alloc = a.getBounds(); Rectangle alloc = a.getBounds();
@ -777,9 +777,11 @@ public class WrappedPlainView extends BoxView implements TabExpander {
if (pos > p0) { if (pos > p0) {
Segment segment = SegmentCache.getSharedSegment(); Segment segment = SegmentCache.getSharedSegment();
loadText(segment, p0, pos); loadText(segment, p0, pos);
alloc.x += Utilities.getTabbedTextWidth(segment, metrics, float x = alloc.x;
alloc.x, WrappedPlainView.this, p0); x += Utilities.getTabbedTextWidth(segment, metrics, x,
WrappedPlainView.this, p0);
SegmentCache.releaseSharedSegment(segment); SegmentCache.releaseSharedSegment(segment);
return new Rectangle2D.Float(x, alloc.y, alloc.width, alloc.height);
} }
return alloc; return alloc;
} }