Mercurial > hg > Members > riono > TreeVNC_ja_comment
comparison src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java @ 445:c2323d1012d4
fit Screen retina fix
author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
---|---|
date | Fri, 17 Jun 2016 15:58:14 +0900 |
parents | 9a938b714c6b |
children | 9ab123ce3d9f |
comparison
equal
deleted
inserted
replaced
444:9a938b714c6b | 445:c2323d1012d4 |
---|---|
928 if (viewer.getRfb().isTreeManager()) { | 928 if (viewer.getRfb().isTreeManager()) { |
929 changeVncServer(viewer, x, y, singleWidth, singleHeight, scale, viewer.getRfb().getId()); | 929 changeVncServer(viewer, x, y, singleWidth, singleHeight, scale, viewer.getRfb().getId()); |
930 // treeeManager may have its parent | 930 // treeeManager may have its parent |
931 } | 931 } |
932 if (viewer.getRfb().hasParent()) { | 932 if (viewer.getRfb().hasParent()) { |
933 System.out.println("send serverchange to parent"); | |
933 String adr = viewer.getRfb().getMyAddress(); | 934 String adr = viewer.getRfb().getMyAddress(); |
934 if (scanPort(adr, ConnectionParams.DEFAULT_RFB_PORT)) { | 935 if (scanPort(adr, ConnectionParams.DEFAULT_RFB_PORT)) { |
935 // -1 means request to reverse direct connection socket | 936 // -1 means request to reverse direct connection socket |
936 short id = viewer.getRfb().isTreeManager()? (short)-1 : viewer.getRfb().getId(); | 937 short id = viewer.getRfb().isTreeManager()? (short)-1 : viewer.getRfb().getId(); |
937 context.sendMessage(new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, id, x, y, singleWidth, singleHeight, scale)); | 938 context.sendMessage(new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, id, x, y, singleWidth, singleHeight, scale)); |
993 int thisRetinaScale = retinaScale(thisScreenNumber); | 994 int thisRetinaScale = retinaScale(thisScreenNumber); |
994 | 995 |
995 final int thatScreenX = presenter.getX(); | 996 final int thatScreenX = presenter.getX(); |
996 final int thatScreenY = presenter.getY(); | 997 final int thatScreenY = presenter.getY(); |
997 int thatRetinaScale = presenter.getRetinaScale(); | 998 int thatRetinaScale = presenter.getRetinaScale(); |
998 final int thatScreenWidth = presenter.getFrameSizeWidth()* thatRetinaScale; | 999 final int thatScreenWidth = presenter.getFrameSizeWidth(); |
999 final int thatScreenHeight = presenter.getFrameSizeHeight()* thatRetinaScale; | 1000 final int thatScreenHeight = presenter.getFrameSizeHeight(); |
1000 showScreenInfo("that", 0, thatScreenX, thatScreenY, thatScreenWidth, thatScreenHeight, thatRetinaScale); | 1001 showScreenInfo("that", 0, thatScreenX, thatScreenY, thatScreenWidth, thatScreenHeight, thatRetinaScale); |
1001 | 1002 |
1002 frame.setSize(thisScreenWidth, thisScreenHeight); | 1003 frame.setSize(thisScreenWidth, thisScreenHeight); |
1003 final double scale = uiSettings.fitScreen(thisScreenWidth, thisScreenHeight, thatScreenWidth, thatScreenHeight); | 1004 final double scale = uiSettings.fitScreen(thisScreenWidth, thisScreenHeight, thatScreenWidth, thatScreenHeight); |
1004 // final Rectangle visible = new Rectangle(thatScreenX,thatScreenY,thatScreenWidth,thatScreenHeight); | 1005 // final Rectangle visible = new Rectangle(thatScreenX,thatScreenY,thatScreenWidth,thatScreenHeight); |