8010375: sun.swing.JLightweightFrame should be implemented for XToolkit
Reviewed-by: anthony
--- a/jdk/src/share/classes/sun/swing/JLightweightFrame.java Wed Mar 27 16:19:51 2013 +0400
+++ b/jdk/src/share/classes/sun/swing/JLightweightFrame.java Fri Mar 29 16:12:11 2013 +0400
@@ -72,8 +72,10 @@
public JLightweightFrame() {
super();
add(rootPane, BorderLayout.CENTER);
- setBackground(new Color(0, 0, 0, 0));
setFocusTraversalPolicy(new LayoutFocusTraversalPolicy());
+ if (getGraphicsConfiguration().isTranslucencyCapable()) {
+ setBackground(new Color(0, 0, 0, 0));
+ }
}
/**
--- a/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java Wed Mar 27 16:19:51 2013 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XFramePeer.java Fri Mar 29 16:12:11 2013 +0400
@@ -642,5 +642,11 @@
return getBounds();
}
- public void emulateActivation(boolean doActivate) {}
+ public void emulateActivation(boolean doActivate) {
+ if (doActivate) {
+ handleWindowFocusIn(0);
+ } else {
+ handleWindowFocusOut(null, 0);
+ }
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/solaris/classes/sun/awt/X11/XLightweightFramePeer.java Fri Mar 29 16:12:11 2013 +0400
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013, 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
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.awt.X11;
+
+import java.awt.Graphics;
+
+import sun.awt.LightweightFrame;
+
+public class XLightweightFramePeer extends XFramePeer {
+
+ XLightweightFramePeer(LightweightFrame target) {
+ super(target);
+ }
+
+ private LightweightFrame getLwTarget() {
+ return (LightweightFrame)target;
+ }
+
+ @Override
+ public Graphics getGraphics() {
+ return getLwTarget().getGraphics();
+ }
+
+ @Override
+ public void xSetVisible(boolean visible) {
+ this.visible = visible;
+ }
+
+ @Override
+ protected void requestXFocus(long time, boolean timeProvided) {
+ // not sending native focus events to the proxy
+ }
+
+ @Override
+ public void setGrab(boolean grab) {
+ if (grab) {
+ getLwTarget().grabFocus();
+ } else {
+ getLwTarget().ungrabFocus();
+ }
+ }
+}
--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Wed Mar 27 16:19:51 2013 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Fri Mar 29 16:12:11 2013 +0400
@@ -420,7 +420,9 @@
}
public FramePeer createLightweightFrame(LightweightFrame target) {
- return null;
+ FramePeer peer = new XLightweightFramePeer(target);
+ targetCreatedPeer(target, peer);
+ return peer;
}
public FramePeer createFrame(Frame target) {