8138749: Revisited: PrinterJob.printDialog() does not support multi-mon, always displayed on primary
Reviewed-by: prr, jdv
--- a/jdk/src/java.desktop/share/classes/javax/print/ServiceUI.java Thu Mar 03 12:20:11 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/javax/print/ServiceUI.java Thu Mar 03 12:34:41 2016 +0530
@@ -193,36 +193,48 @@
getLocalGraphicsEnvironment().getDefaultScreenDevice().
getDefaultConfiguration().getBounds() : gc.getBounds();
+ x += gcBounds.x;
+ y += gcBounds.y;
ServiceDialog dialog;
if (owner instanceof Frame) {
dialog = new ServiceDialog(gc,
- x + gcBounds.x,
- y + gcBounds.y,
+ x,
+ y,
services, defaultIndex,
flavor, attributes,
(Frame)owner);
} else {
dialog = new ServiceDialog(gc,
- x + gcBounds.x,
- y + gcBounds.y,
+ x,
+ y,
services, defaultIndex,
flavor, attributes,
(Dialog)owner);
}
Rectangle dlgBounds = dialog.getBounds();
- // get union of all GC bounds
- GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
- GraphicsDevice[] gs = ge.getScreenDevices();
- for (int j=0; j<gs.length; j++) {
- gcBounds =
- gcBounds.union(gs[j].getDefaultConfiguration().getBounds());
- }
-
// if portion of dialog is not within the gc boundary
if (!gcBounds.contains(dlgBounds)) {
- // put in the center relative to parent frame/dialog
- dialog.setLocationRelativeTo(owner);
+ // check if dialog exceed window bounds at left or bottom
+ // Then position the dialog by moving it by the amount it exceeds
+ // the window bounds
+ // If it results in dialog moving beyond the window bounds at top/left
+ // then position it at window top/left
+ if (dlgBounds.x + dlgBounds.width > gcBounds.x + gcBounds.width) {
+ if ((gcBounds.x + gcBounds.width - dlgBounds.width) > gcBounds.x) {
+ x = (gcBounds.x + gcBounds.width) - dlgBounds.width;
+ } else {
+ x = gcBounds.x;
+ }
+ }
+ if (dlgBounds.y + dlgBounds.height > gcBounds.y + gcBounds.height) {
+ if ((gcBounds.y + gcBounds.height - dlgBounds.height) > gcBounds.y) {
+ y = (gcBounds.y + gcBounds.height) - dlgBounds.height;
+ } else {
+ y = gcBounds.y;
+ }
+ }
+ dialog.setBounds(x, y, dlgBounds.width, dlgBounds.height);
}
dialog.show();
--- a/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java Thu Mar 03 12:20:11 2016 +0530
+++ b/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java Thu Mar 03 12:34:41 2016 +0530
@@ -791,12 +791,15 @@
return page;
}
- final GraphicsConfiguration gc =
- GraphicsEnvironment.getLocalGraphicsEnvironment().
- getDefaultScreenDevice().getDefaultConfiguration();
- Rectangle bounds = gc.getBounds();
- int x = bounds.x+bounds.width/3;
- int y = bounds.y+bounds.height/3;
+ GraphicsConfiguration grCfg = null;
+ Window w = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
+ if (w != null) {
+ grCfg = w.getGraphicsConfiguration();
+ } else {
+ grCfg = GraphicsEnvironment.getLocalGraphicsEnvironment().
+ getDefaultScreenDevice().getDefaultConfiguration();
+ }
+ final GraphicsConfiguration gc = grCfg;
PrintService service = java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<PrintService>() {
@@ -814,9 +817,39 @@
return null;
}
+ // we position the dialog a little beyond the upper-left corner of the window
+ // which is consistent with the NATIVE page dialog
+ Rectangle gcBounds = gc.getBounds();
+ int x = gcBounds.x+50;
+ int y = gcBounds.y+50;
ServiceDialog pageDialog = new ServiceDialog(gc, x, y, service,
DocFlavor.SERVICE_FORMATTED.PAGEABLE,
attributes, (Frame)null);
+ Rectangle dlgBounds = pageDialog.getBounds();
+
+ // if portion of dialog is not within the gc boundary
+ if (!gcBounds.contains(dlgBounds)) {
+ // check if dialog exceed window bounds at left or bottom
+ // Then position the dialog by moving it by the amount it exceeds
+ // the window bounds
+ // If it results in dialog moving beyond the window bounds at top/left
+ // then position it at window top/left
+ if (dlgBounds.x + dlgBounds.width > gcBounds.x + gcBounds.width) {
+ if ((gcBounds.x + gcBounds.width - dlgBounds.width) > gcBounds.x) {
+ x = (gcBounds.x + gcBounds.width) - dlgBounds.width;
+ } else {
+ x = gcBounds.x;
+ }
+ }
+ if (dlgBounds.y + dlgBounds.height > gcBounds.y + gcBounds.height) {
+ if ((gcBounds.y + gcBounds.height - dlgBounds.height) > gcBounds.y) {
+ y = (gcBounds.y + gcBounds.height) - dlgBounds.height;
+ } else {
+ y = gcBounds.y;
+ }
+ }
+ pageDialog.setBounds(x, y, dlgBounds.width, dlgBounds.height);
+ }
pageDialog.show();
if (pageDialog.getStatus() == ServiceDialog.APPROVE) {
@@ -893,9 +926,15 @@
* We raise privilege when we put up the dialog, to avoid
* the "warning applet window" banner.
*/
- final GraphicsConfiguration gc =
- GraphicsEnvironment.getLocalGraphicsEnvironment().
- getDefaultScreenDevice().getDefaultConfiguration();
+ GraphicsConfiguration grCfg = null;
+ Window w = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
+ if (w != null) {
+ grCfg = w.getGraphicsConfiguration();
+ } else {
+ grCfg = GraphicsEnvironment.getLocalGraphicsEnvironment().
+ getDefaultScreenDevice().getDefaultConfiguration();
+ }
+ final GraphicsConfiguration gc = grCfg;
PrintService service = java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<PrintService>() {
@@ -940,9 +979,10 @@
}
}
- Rectangle bounds = gc.getBounds();
- int x = bounds.x+bounds.width/3;
- int y = bounds.y+bounds.height/3;
+ // we position the dialog a little beyond the upper-left corner of the window
+ // which is consistent with the NATIVE print dialog
+ int x = 50;
+ int y = 50;
PrintService newService;
// temporarily add an attribute pointing back to this job.
PrinterJobWrapper jobWrapper = new PrinterJobWrapper(this);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/print/PrinterJob/MultiMonPrintDlgTest.java Thu Mar 03 12:34:41 2016 +0530
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2015, 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.
+ *
+ * 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.
+ */
+import java.awt.Button;
+import java.awt.Component;
+import java.awt.Frame;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.KeyboardFocusManager;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+
+/**
+ * @test
+ * @bug 8138749
+ * @summary PrinterJob.printDialog() does not support multi-mon,
+ * always displayed on primary
+ * @run main/manual MultiMonPrintDlgTest
+ */
+public class MultiMonPrintDlgTest implements ActionListener {
+
+ Frame primaryFrame = null;
+ Frame secFrame = null;
+ GraphicsDevice gd[] = GraphicsEnvironment.getLocalGraphicsEnvironment().
+ getScreenDevices();
+
+ public MultiMonPrintDlgTest() throws Exception {
+ if (gd.length <= 1) {
+ System.out.println("This test should be run only on dual-monitor systems. Aborted!!");
+ return;
+ }
+
+ String[] instructions =
+ {
+ " This test should be running on a dual-monitor setup.",
+ "A frame will be created on each of the 2 monitor. ",
+ "Click the Print button on the frame displayed in the non-default monitor.",
+ "Please verify that page dialog followed by print dialog ",
+ " is displayed in the same screen",
+ "where the frame is located ie, in the non-default monitor.",
+ };
+
+ SwingUtilities.invokeAndWait(() -> {
+ JOptionPane.showMessageDialog(
+ (Component) null,
+ instructions,
+ "information", JOptionPane.INFORMATION_MESSAGE);
+ });
+ GraphicsDevice defDev = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
+ int x = 0;
+ Frame f = null;
+ for (x = 0; x < gd.length; x ++) {
+ if (gd[x] != defDev) {
+ secFrame = new Frame("Screen " + x + " - secondary", gd[x].getDefaultConfiguration());
+ f = secFrame;
+ } else {
+ primaryFrame = new Frame("Screen " + x + " - primary", gd[x].getDefaultConfiguration());
+ f = primaryFrame;
+ }
+ Button b = new Button("Print");
+ b.addActionListener(this);
+ f.add("South", b);
+ f.addWindowListener (new WindowAdapter() {
+ public void windowClosing(WindowEvent we) {
+ ((Window) we.getSource()).dispose();
+ }
+ });
+ f.setSize(200, 200);
+ f.setVisible(true);
+ }
+ }
+
+ public void actionPerformed (ActionEvent ae) {
+ try {
+ javax.print.attribute.PrintRequestAttributeSet prSet =
+ new javax.print.attribute.HashPrintRequestAttributeSet();
+ java.awt.print.PrinterJob.getPrinterJob().pageDialog(prSet);
+ Window w = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
+ int dialogButton = JOptionPane.showConfirmDialog (w,
+ "Did the pageDialog shown in non-default monitor?",
+ null, JOptionPane.YES_NO_OPTION);
+ if(dialogButton == JOptionPane.NO_OPTION) {
+ throw new RuntimeException("PageDialog is shown in wrong monitor");
+ }
+ java.awt.print.PrinterJob.getPrinterJob().printDialog(prSet);
+ dialogButton = JOptionPane.showConfirmDialog (w,
+ "Did the printDialog shown in non-default monitor?",
+ null, JOptionPane.YES_NO_OPTION);
+ if(dialogButton == JOptionPane.NO_OPTION) {
+ throw new RuntimeException("PrintDialog is shown in wrong monitor");
+ }
+ } finally {
+ primaryFrame.dispose();
+ secFrame.dispose();
+ }
+ }
+
+ public static void main (String args[]) throws Exception {
+ MultiMonPrintDlgTest test = new MultiMonPrintDlgTest();
+ }
+}