Bugfix for calculating correct minimal scale and screen ratio when re…

…solution has changed to a smaller one.
iiordanov · Aug 22, 2019 · 9bdf029 · 9bdf029
1 parent 36f9ca8
commit 9bdf029
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/bVNC/AndroidManifest.xml.aRDP b/bVNC/AndroidManifest.xml.aRDP
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.iiordanov.aRDP" android:installLocation="auto"
-          android:versionCode="114072" android:versionName="v4.0.7">
+          android:versionCode="114073" android:versionName="v4.0.7">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>

diff --git a/bVNC/AndroidManifest.xml.aSPICE b/bVNC/AndroidManifest.xml.aSPICE
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.iiordanov.aSPICE" android:installLocation="auto"
-          android:versionCode="114072" android:versionName="v4.0.7">
+          android:versionCode="114073" android:versionName="v4.0.7">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>

diff --git a/bVNC/AndroidManifest.xml.bVNC b/bVNC/AndroidManifest.xml.bVNC
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.iiordanov.bVNC" android:installLocation="auto"
-          android:versionCode="114072" android:versionName="v4.0.7">
+          android:versionCode="114073" android:versionName="v4.0.7">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>

diff --git a/bVNC/AndroidManifest.xml.freeaRDP b/bVNC/AndroidManifest.xml.freeaRDP
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.iiordanov.freeaRDP" android:installLocation="auto"
-          android:versionCode="114072" android:versionName="v4.0.7">
+          android:versionCode="114073" android:versionName="v4.0.7">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>

diff --git a/bVNC/AndroidManifest.xml.freeaSPICE b/bVNC/AndroidManifest.xml.freeaSPICE
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.iiordanov.freeaSPICE" android:installLocation="auto"
-          android:versionCode="114072" android:versionName="v4.0.7">
+          android:versionCode="114073" android:versionName="v4.0.7">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>

diff --git a/bVNC/AndroidManifest.xml.freebVNC b/bVNC/AndroidManifest.xml.freebVNC
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.iiordanov.freebVNC" android:installLocation="auto"
-          android:versionCode="114072" android:versionName="v4.0.7">
+          android:versionCode="114073" android:versionName="v4.0.7">
 
     <uses-permission tools:node="removeAll"/>
     <uses-permission android:name="android.permission.INTERNET"> </uses-permission>

diff --git a/bVNC/src2/main/java/com/iiordanov/bVNC/AbstractBitmapData.java b/bVNC/src2/main/java/com/iiordanov/bVNC/AbstractBitmapData.java
@@ -100,11 +100,11 @@ boolean isNotInitSoftCursor() {
      * the bitmap would be smaller than the screen
      */
     float getMinimumScale() {
-        return Math.min((float)vncCanvas.getWidth()/bitmapwidth, (float)vncCanvas.getHeight()/bitmapheight);
+        return Math.min((float)vncCanvas.getWidth()/framebufferwidth, (float)vncCanvas.getHeight()/framebufferheight);
     }
 
     boolean widthRatioLessThanHeightRatio() {
-        return (float)vncCanvas.getWidth()/bitmapwidth < vncCanvas.getHeight()/bitmapheight;
+        return (float)vncCanvas.getWidth()/framebufferwidth < vncCanvas.getHeight()/framebufferheight;
     }
 
     /**