Merge pull request livecode#3515 from livecodeian/bugfix-16772

livecodepanos · livecodepanos · commit 9a66255b5072 · 2016-02-01T09:40:19.000Z
[[ Bug 16772 ]] Fix Android working screenrect offset
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
@@ -1145,10 +1145,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)
 			{
@@ -1182,6 +1185,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
`@@ -1145,10 +1145,13 @@ private Rect getWorkarea(boolean p_update, int p_new_width, int p_new_height)`
`1145`	`1145`
`1146`	`1146`	`boolean t_portrait = t_viewport.height() > t_viewport.width();`
`1147`	`1147`
	`1148`	`+ int[] t_origin = new int[2];`
	`1149`	`+ getLocationOnScreen(t_origin);`
	`1150`	`+`
`1148`	`1151`	`// We have new values and the keyboard isn't showing so update any sizes we don't already know`
`1149`	`1152`	`if (p_update && !m_keyboard_visible)`
`1150`	`1153`	`{`
`1151`		`- t_working_rect = new Rect(0, 0, p_new_width, p_new_height);`
	`1154`	`+ t_working_rect = new Rect(t_origin[0], t_origin[1], t_origin[0] + p_new_width, t_origin[1] + p_new_height);`
`1152`	`1155`
`1153`	`1156`	`if (t_portrait && !m_know_portrait_size)`
`1154`	`1157`	`{`
`@@ -1182,6 +1185,7 @@ else if (!t_portrait && m_know_landscape_size)`
`1182`	`1185`	`t_working_rect = new Rect(t_viewport);`
`1183`	`1186`	`if (m_know_statusbar_size)`
`1184`	`1187`	`t_working_rect.bottom -= m_statusbar_size;`
	`1188`	`+ t_working_rect.offsetTo(t_origin[0], t_origin[1]);`
`1185`	`1189`	`}`
`1186`	`1190`
`1187`	`1191`	`return t_working_rect;`