jdk-sandbox: comparison jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java

equal deleted inserted replaced

-:6ff366cc096b
+:8c0e8e13d4d8
 /*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * questions.
 */
 package sun.swing;
-import java.awt.BorderLayout;
+import java.awt.*;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.MouseInfo;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Window;
 import java.awt.dnd.DragGestureEvent;
 import java.awt.dnd.DragGestureListener;
 import java.awt.dnd.DragGestureRecognizer;
 import java.awt.dnd.DragSource;
 import java.awt.dnd.DropTarget;
 import java.awt.dnd.InvalidDnDOperationException;
 import java.awt.dnd.peer.DragSourceContextPeer;
 import java.awt.event.ContainerEvent;
 import java.awt.event.ContainerListener;
+import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.security.AccessController;
 private Component component;
 private JPanel contentPane;
 private BufferedImage bbImage;
-private volatile int scaleFactor = 1;
+private volatile double scaleFactorX;
+private volatile double scaleFactorY;
 /**
 * {@code copyBufferEnabled}, true by default, defines the following strategy.
 * A duplicating (copy) buffer is created for the original pixel buffer.
 * The copy buffer is synchronized with the original buffer every time the
 * Constructs a new, initially invisible {@code JLightweightFrame}
 * instance.
 */
 public JLightweightFrame() {
 super();
+AffineTransform defaultTransform =
+getGraphicsConfiguration().getDefaultTransform();
+scaleFactorX = defaultTransform.getScaleX();
+scaleFactorY = defaultTransform.getScaleY();
 copyBufferEnabled = "true".equals(AccessController.
 doPrivileged(new GetPropertyAction("swing.jlf.copyBufferEnabled", "true")));
 add(rootPane, BorderLayout.CENTER);
 setFocusTraversalPolicy(new LayoutFocusTraversalPolicy());
 if (jlf != JLightweightFrame.this) {
 return;
 }
 Point p = SwingUtilities.convertPoint(c, x, y, jlf);
 Rectangle r = new Rectangle(p.x, p.y, w, h).intersection(
-new Rectangle(0, 0, bbImage.getWidth() / scaleFactor,
+new Rectangle(0, 0,
-bbImage.getHeight() / scaleFactor));
+(int)Math.round(bbImage.getWidth() / scaleFactorX),
+(int)Math.round(bbImage.getHeight() / scaleFactorY)));
 if (!r.isEmpty()) {
 notifyImageUpdated(r.x, r.y, r.width, r.height);
 }
 };
 Graphics2D g = bbImage.createGraphics();
 g.setBackground(getBackground());
 g.setColor(getForeground());
 g.setFont(getFont());
-g.scale(scaleFactor, scaleFactor);
+g.scale(scaleFactorX, scaleFactorY);
 return g;
 }
 /**
 * {@inheritDoc}
 public void ungrabFocus() {
 if (content != null) content.focusUngrabbed();
 }
 @Override
+@SuppressWarnings("deprecation")
 public int getScaleFactor() {
-return scaleFactor;
+return (int)scaleFactorX;
+}
+@Override
+public double getScaleFactorX() {
+return scaleFactorX;
+}
+@Override
+public double getScaleFactorY() {
+return scaleFactorY;
 }
 @Override
 public void notifyDisplayChanged(final int scaleFactor) {
-if (scaleFactor != this.scaleFactor) {
+notifyDisplayChanged(scaleFactor, scaleFactor);
+}
+@Override
+public void notifyDisplayChanged(final double scaleFactorX,
+final double scaleFactorY) {
+if (Double.compare(scaleFactorX, this.scaleFactorX) != 0 ||
+Double.compare(scaleFactorY, this.scaleFactorY) != 0) {
 if (!copyBufferEnabled) content.paintLock();
 try {
 if (bbImage != null) {
-resizeBuffer(getWidth(), getHeight(), scaleFactor);
+resizeBuffer(getWidth(), getHeight(), scaleFactorX,
+scaleFactorY);
 }
 } finally {
 if (!copyBufferEnabled) content.paintUnlock();
 }
-this.scaleFactor = scaleFactor;
+this.scaleFactorX = scaleFactorX;
-}
+this.scaleFactorY = scaleFactorY;
-final Object peer = AWTAccessor.getComponentAccessor().getPeer(this);
-if (peer instanceof DisplayChangedListener) {
+if(isVisible()) {
-((DisplayChangedListener) peer).displayChanged();
+final Object peer =
-}
+AWTAccessor.getComponentAccessor().getPeer(this);
-repaint();
+if (peer instanceof DisplayChangedListener) {
+((DisplayChangedListener) peer).displayChanged();
+}
+repaint();
+}
+}
 }
 @Override
 public void addNotify() {
 super.addNotify();
 if (peer instanceof DisplayChangedListener) {
 ((DisplayChangedListener) peer).displayChanged();
 }
 }
-private void syncCopyBuffer(boolean reset, int x, int y, int w, int h, int scale) {
+private void syncCopyBuffer(boolean reset, int x, int y, int w, int h,
+double scaleX, double scaleY) {
 content.paintLock();
 try {
 int[] srcBuffer = ((DataBufferInt)bbImage.getRaster().getDataBuffer()).getData();
 if (reset) {
 copyBuffer = new int[srcBuffer.length];
 }
 int linestride = bbImage.getWidth();
-x *= scale;
+int startX = (int)Math.floor(x * scaleX);
-y *= scale;
+int startY = (int)Math.floor(y * scaleY);
-w *= scale;
+int width  = (int)Math.ceil((x + w) * scaleX) - startX;
-h *= scale;
+int height = (int)Math.ceil((y + h) * scaleY) - startY;
-for (int i=0; i<h; i++) {
+for (int i = 0; i < height; i++) {
-int from = (y + i) * linestride + x;
+int from = (startY + i) * linestride + startX;
-System.arraycopy(srcBuffer, from, copyBuffer, from, w);
+System.arraycopy(srcBuffer, from, copyBuffer, from, width);
 }
 } finally {
 content.paintUnlock();
 }
 }
 private void notifyImageUpdated(int x, int y, int width, int height) {
 if (copyBufferEnabled) {
-syncCopyBuffer(false, x, y, width, height, scaleFactor);
+syncCopyBuffer(false, x, y, width, height, scaleFactorX,
+scaleFactorY);
 }
 content.imageUpdated(x, y, width, height);
 }
 @SuppressWarnings("serial") // anonymous class inside
 try {
 boolean createBB = (bbImage == null);
 int newW = width;
 int newH = height;
 if (bbImage != null) {
-int imgWidth = bbImage.getWidth() / scaleFactor;
+int imgWidth = (int)Math.round(bbImage.getWidth() /
-int imgHeight = bbImage.getHeight() / scaleFactor;
+scaleFactorX);
+int imgHeight = (int)Math.round(bbImage.getHeight() /
+scaleFactorY);
 if (width != imgWidth || height != imgHeight) {
 createBB = true;
 if (bbImage != null) {
 int oldW = imgWidth;
 int oldH = imgHeight;
 }
 }
 }
 }
 if (createBB) {
-resizeBuffer(newW, newH, scaleFactor);
+resizeBuffer(newW, newH, scaleFactorX, scaleFactorY);
 return;
 }
 content.imageReshaped(0, 0, width, height);
 } finally {
 content.paintUnlock();
 }
 }
 }
-private void resizeBuffer(int width, int height, int newScaleFactor) {
+private void resizeBuffer(int width, int height, double newScaleFactorX,
-bbImage = new BufferedImage(width*newScaleFactor,height*newScaleFactor,
+double newScaleFactorY) {
+bbImage = new BufferedImage((int)Math.round(width * newScaleFactorX),
+(int)Math.round(height * newScaleFactorY),
 BufferedImage.TYPE_INT_ARGB_PRE);
 int[] pixels= ((DataBufferInt)bbImage.getRaster().getDataBuffer()).getData();
 if (copyBufferEnabled) {
-syncCopyBuffer(true, 0, 0, width, height, newScaleFactor);
+syncCopyBuffer(true, 0, 0, width, height, newScaleFactorX,
+newScaleFactorY);
 pixels = copyBuffer;
 }
 content.imageBufferReset(pixels, 0, 0, width, height,
-width * newScaleFactor, newScaleFactor);
+bbImage.getWidth(), newScaleFactorX, newScaleFactorY);
 }
 @Override
 public JRootPane getRootPane() {
 return rootPane;

changeset 42199	8c0e8e13d4d8
parent 30469	bac0a7ff7e1e
child 42216	621af0ebf6c4