Mercurial > hg > Applications > TreeVNC

changeset 469:3332879d1bd0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix retina frame buffer position
author mir3636
date Fri, 29 Jul 2016 16:03:51 +0900
parents f8a88cdb857b
children f7210f834403
files src/viewer_swing/java/com/glavsoft/viewer/Viewer.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java
diffstat 2 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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);
                 }
--- 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();