Fix insets for CacioWindowPeer.
authorRoman Kennke <roman.kennke@aicas.com>
Wed May 13 11:48:48 2009 +0200 (10 months ago)
changeset 204a7c70be0733b
parent 203fe686c8c8f6b
child 20552738a5ced55
Fix insets for CacioWindowPeer.
src/share/classes/sun/awt/peer/cacio/CacioWindowPeer.java
--- a/src/share/classes/sun/awt/peer/cacio/CacioWindowPeer.java Wed May 13 11:46:54 2009 +0200
+++ b/src/share/classes/sun/awt/peer/cacio/CacioWindowPeer.java Wed May 13 11:48:48 2009 +0200
@@ -34,7 +34,6 @@ import java.awt.Window;
import java.awt.Window;
import java.awt.event.FocusEvent;
import java.awt.event.WindowEvent;
-import java.awt.image.BufferedImage;
import java.awt.peer.WindowPeer;
import javax.swing.JRootPane;
@@ -151,33 +150,36 @@ class CacioWindowPeer extends CacioConta
@Override
public Insets getInsets() {
-
- JRootPane rp = getSwingComponent();
- if (rp == null) {
- return new Insets(0, 0, 0, 0);
- }
- if (! rp.isValid()) {
- rp.validate();
- }
- Component cp = rp.getContentPane();
- Rectangle cpBounds = cp.getBounds();
- Component lp = rp.getLayeredPane();
- Point lpLoc = lp.getLocation();
- int top = cpBounds.y + lpLoc.y;
- int left = cpBounds.x + lpLoc.x;
- Border b = rp.getBorder();
- int bottom;
- int right;
- if (b != null) {
- Insets bi = b.getBorderInsets(rp);
- bottom = bi.bottom;
- right = bi.right;
+ if (decorateWindows) {
+ JRootPane rp = getSwingComponent();
+ if (rp == null) {
+ return new Insets(0, 0, 0, 0);
+ }
+ if (! rp.isValid()) {
+ rp.validate();
+ }
+ Component cp = rp.getContentPane();
+ Rectangle cpBounds = cp.getBounds();
+ Component lp = rp.getLayeredPane();
+ Point lpLoc = lp.getLocation();
+ int top = cpBounds.y + lpLoc.y;
+ int left = cpBounds.x + lpLoc.x;
+ Border b = rp.getBorder();
+ int bottom;
+ int right;
+ if (b != null) {
+ Insets bi = b.getBorderInsets(rp);
+ bottom = bi.bottom;
+ right = bi.right;
+ } else {
+ bottom = 0;
+ right = 0;
+ }
+ Insets insets = new Insets(top, left, bottom, right);
+ return insets;
} else {
- bottom = 0;
- right = 0;
- }
- Insets insets = new Insets(top, left, bottom, right);
- return insets;
+ return platformWindow.getInsets();
+ }
}
@Override