diff src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java @ 317:3c63bc88383e

always fit screen, -d mode.
author oc
date Thu, 29 Jan 2015 13:29:02 +0900
parents e95cb9a3dd9b
children a237c7e3b7ca
line wrap: on
line diff
--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Thu Jan 29 11:59:34 2015 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Thu Jan 29 13:29:02 2015 +0900
@@ -898,8 +898,8 @@
                 if (!viewer.getRfb().isTreeManager()) {
                     context.sendMessage(new RequestSingleDisplayWidth());
                 }
-                double scalePercent = uiSettings.fitScreen(thisScreenWidth, thisScreenHeight, singleWidth, singleHeight);
                 frame.setSize(thisScreenWidth, thisScreenHeight);
+                uiSettings.fitScreen(thisScreenWidth, thisScreenHeight, singleWidth, singleHeight);
             }
         });
         kbdButtons.add(fitScreenButton);
@@ -930,6 +930,18 @@
 
         setButtonsBarVisible(true, container);
     }
+    
+    public void fitScreen() {
+        ArrayList<Rectangle> rectangles = viewer.getScreenRectangles();
+        int leftScreenNumber = 0;
+        int thisScreenWidth = (int) rectangles.get(leftScreenNumber).getWidth();
+        int thisScreenHeight = (int) rectangles.get(leftScreenNumber).getHeight();
+
+        int singleWidth = viewer.getRfb().getSingleWidth();
+        int singleHeight = viewer.getRfb().getSingleHeight();
+        frame.setSize(thisScreenWidth, thisScreenHeight);
+        uiSettings.fitScreen(thisScreenWidth, thisScreenHeight, singleWidth, singleHeight);
+    }
 
     private void shareSound(boolean isTreeManager, ProtocolContext context) throws SocketException, UnknownHostException {
         viewer.getRfb().createSendSoundThread(viewer.getRfb());