diff src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java @ 447:3996fde6f8ed

cleanUp
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Fri, 17 Jun 2016 17:06:22 +0900
parents 9ab123ce3d9f
children 344a35b7c47f
line wrap: on
line diff
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Fri Jun 17 16:06:13 2016 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Fri Jun 17 17:06:22 2016 +0900
@@ -857,13 +857,13 @@
                 ArrayList<Rectangle> rectangles = viewer.getScreenRectangles();
                 if (rectangles.size() == 1) { // single display
                     screenChangeRequest(context, 0);
-                } else if (rectangles.size() == 2){ // dual display
+                } else if (rectangles.size() > 1){ // dual display
                     ScreenChangeSelectionPanel selectionPanel = new ScreenChangeSelectionPanel(viewerWindow, context);
                     for (int i = 0; i < rectangles.size(); i++) {
                         Rectangle rectangle = rectangles.get(i);
-                        int scale = retinaScale(i);
-                        int screenWidth = rectangle.width * scale;
-                        int screenHeight = rectangle.height * scale;
+                        // int scale = retinaScale(i);
+                        int screenWidth = rectangle.width; //  * scale;
+                        int screenHeight = rectangle.height; // * scale;
                         selectionPanel.checkBox(screenWidth+" X "+screenHeight);
                     }
                     selectionPanel.setButton();
@@ -990,11 +990,11 @@
         }
         int thisScreenWidth = (int) rectangles.get(thisScreenNumber).getWidth();
         int thisScreenHeight = (int) rectangles.get(thisScreenNumber).getHeight();
-        int thisRetinaScale = retinaScale(thisScreenNumber);
+        // int thisRetinaScale = retinaScale(thisScreenNumber);
 
         final int thatScreenX = presenter.getX();
         final int thatScreenY = presenter.getY();
-        int thatRetinaScale = presenter.getRetinaScale();
+        // int thatRetinaScale = presenter.getRetinaScale();
         final int thatScreenWidth = presenter.getFrameSizeWidth();
         final int thatScreenHeight = presenter.getFrameSizeHeight();
         // showScreenInfo("that", 0, thatScreenX, thatScreenY, thatScreenWidth, thatScreenHeight, thatRetinaScale);