[[ Bug 16772 ]] Fix Android working screenrect offset

livecodeian · livecodeian · commit d3d39e294507 · 2016-01-27T10:18:40.000Z
diff --git a/docs/notes/bugfix-16772.md b/docs/notes/bugfix-16772.md
@@ -0,0 +1 @@
+# Android: fix incorrect offset of the working screenrect
diff --git a/engine/src/java/com/runrev/android/Engine.java b/engine/src/java/com/runrev/android/Engine.java
@@ -1130,10 +1130,13 @@ private Rect getWorkarea(boolean p_update, int p_new_width, int p_new_height)
 		
 		boolean t_portrait = t_viewport.height() > t_viewport.width();
 
+		int[] t_origin = new int[2];
+		getLocationOnScreen(t_origin);
+		
 		// We have new values and the keyboard isn't showing so update any sizes we don't already know
 		if (p_update && !m_keyboard_visible)
 		{
-			t_working_rect = new Rect(0, 0, p_new_width, p_new_height);
+			t_working_rect = new Rect(t_origin[0], t_origin[1], t_origin[0] + p_new_width, t_origin[1] + p_new_height);
 			
 			if (t_portrait && !m_know_portrait_size)
 			{
@@ -1167,6 +1170,7 @@ else if (!t_portrait && m_know_landscape_size)
 			t_working_rect = new Rect(t_viewport);
 			if (m_know_statusbar_size)
 				t_working_rect.bottom -= m_statusbar_size;
+			t_working_rect.offsetTo(t_origin[0], t_origin[1]);
 		}
 		
 		return t_working_rect;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Android: fix incorrect offset of the working screenrect`
Original file line number	Diff line number	Diff line change
`@@ -1130,10 +1130,13 @@ private Rect getWorkarea(boolean p_update, int p_new_width, int p_new_height)`
`1130`	`1130`
`1131`	`1131`	`boolean t_portrait = t_viewport.height() > t_viewport.width();`
`1132`	`1132`
	`1133`	`+ int[] t_origin = new int[2];`
	`1134`	`+ getLocationOnScreen(t_origin);`
	`1135`	`+`
`1133`	`1136`	`// We have new values and the keyboard isn't showing so update any sizes we don't already know`
`1134`	`1137`	`if (p_update && !m_keyboard_visible)`
`1135`	`1138`	`{`
`1136`		`- t_working_rect = new Rect(0, 0, p_new_width, p_new_height);`
	`1139`	`+ t_working_rect = new Rect(t_origin[0], t_origin[1], t_origin[0] + p_new_width, t_origin[1] + p_new_height);`
`1137`	`1140`
`1138`	`1141`	`if (t_portrait && !m_know_portrait_size)`
`1139`	`1142`	`{`
`@@ -1167,6 +1170,7 @@ else if (!t_portrait && m_know_landscape_size)`
`1167`	`1170`	`t_working_rect = new Rect(t_viewport);`
`1168`	`1171`	`if (m_know_statusbar_size)`
`1169`	`1172`	`t_working_rect.bottom -= m_statusbar_size;`
	`1173`	`+ t_working_rect.offsetTo(t_origin[0], t_origin[1]);`
`1170`	`1174`	`}`
`1171`	`1175`
`1172`	`1176`	`return t_working_rect;`