commit cb11f8a2884bd1aad06a8f3b6d2fe9cad0d87b73
author Chong Zhang <chz@google.com> Wed Jan 13 19:52:45 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 13 19:52:45 2016 +0000
tree 2c52a89aea6bb96aeafe947104e85bcae9b9e27b
parent f56a60fab2b51b769130961ddf19e5d79e176bfe
parent 84389571531e48962802a5f90206e326054a3d31

Merge "Fix rect convert from screen to surface coordinates with scaling"

services/core/java/com/android/server/wm/WindowState.java

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 058fa67..b09c12b 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -2284,10 +2284,12 @@
 
     void transformFromScreenToSurfaceSpace(Rect rect) {
          if (mHScale >= 0) {
-            rect.right = rect.left + (int)((rect.right - rect.left) / mHScale);
+            rect.left = (int) (rect.left / mHScale);
+            rect.right = (int) (rect.right / mHScale);
         }
         if (mVScale >= 0) {
-            rect.bottom = rect.top + (int)((rect.bottom - rect.top) / mVScale);
+            rect.top = (int) (rect.top / mVScale);
+            rect.bottom = (int) (rect.bottom / mVScale);
         }
     }