# HG changeset patch # User mir3636 # Date 1469775831 -32400 # Node ID 3332879d1bd0e2fbf49b23fd1fe83b5df5b29d5a # Parent f8a88cdb857bcf368e004582e37f7124a7421d18 fix retina frame buffer position diff -r f8a88cdb857b -r 3332879d1bd0 src/viewer_swing/java/com/glavsoft/viewer/Viewer.java --- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Fri Jul 29 15:30:48 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Fri Jul 29 16:03:51 2016 +0900 @@ -520,7 +520,7 @@ for (int i = 1; i < fbRectangles.size(); i++) { FbRectangle fbRect = fbRectangles.get(i); if (fbRectanglesPrev.getRetinaScale() != 1) { - if (fbRectanglesPrev.x + fbRectanglesPrev.width < fbRect.x) { + if (fbRectanglesPrev.x + fbRectanglesPrev.width <= fbRect.x) { // previous screen is touch with this screen, fix retina scale offset retinaOffsetX += fbRectanglesPrev.getWidth() * (fbRectanglesPrev.retinaScale - 1); } @@ -541,7 +541,7 @@ for (int i = 1; i < fbRectangles.size(); i++) { FbRectangle fbRect = fbRectangles.get(i); if (fbRectanglesPrev.getRetinaScale() != 1) { - if (fbRectanglesPrev.y + fbRectanglesPrev.height < fbRect.y) { + if (fbRectanglesPrev.y + fbRectanglesPrev.height <= fbRect.y) { // previous screen is touch with this screen, fix retina scale offset retinaOffsetY += fbRectanglesPrev.getHeight() * (fbRectanglesPrev.retinaScale - 1); } diff -r f8a88cdb857b -r 3332879d1bd0 src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java --- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java Fri Jul 29 15:30:48 2016 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java Fri Jul 29 16:03:51 2016 +0900 @@ -129,12 +129,8 @@ presenter.showMessage("Interrupted"); presenter.connectionFailed(); } catch (ExecutionException e) { - // wait new connectTo System.out.println("lost parent"); - - - String errorMessage = null; try { throw e.getCause();