Merge pull request livecode#6705 from montegoulding/keyboardactivated

livecodepanos · web-flow · commit 7c4781a02a3d · 2018-10-24T17:20:32.000+03:00
[[ Bug ]] Send keyboard messages after effective rect changes
diff --git a/engine/src/java/com/runrev/android/Engine.java b/engine/src/java/com/runrev/android/Engine.java
@@ -609,8 +609,7 @@ public void showKeyboard()
 		
 		// HH-2017-01-18: [[ Bug 18058 ]] Fix keyboard not show in landscape orientation
         imm.showSoftInput(this, InputMethodManager.SHOW_FORCED);
-		updateKeyboardVisible(true);
-    }
+	}
 
     public void hideKeyboard()
     {
@@ -622,8 +621,7 @@ public void hideKeyboard()
 			imm.restartInput(this);
 		
         imm.hideSoftInputFromWindow(getWindowToken(), 0);
-		updateKeyboardVisible(false);
-    }
+	}
 
 	public void resetKeyboard()
 	{
@@ -1425,23 +1423,6 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh)
 	{
 		// Log.i(TAG, "onSizeChanged({" + w + "x" + h + "}, {" + oldw + ", " + oldh + "})");
 		
-		// status bar height
-		int t_status_bar_height = 0;
-		int t_resource_id = getResources().getIdentifier("status_bar_height", "dimen", "android");
-		if (t_resource_id > 0)
-		{
-			t_status_bar_height = getResources().getDimensionPixelSize(t_resource_id);
-		}
-		
-		// display window size for the app layout
-		Rect t_app_rect = new Rect();
-		getActivity().getWindow().getDecorView().getWindowVisibleDisplayFrame(t_app_rect);
-		
-		// keyboard height equals (screen height - (user app height + status))
-		int t_keyboard_height = getContainer().getRootView().getHeight() - (t_app_rect.height() + t_status_bar_height);
-		
-		updateKeyboardVisible(t_keyboard_height > 0);
-		
 		Rect t_rect;
 		t_rect = null;
 		
diff --git a/engine/src/java/com/runrev/android/LiveCodeActivity.java b/engine/src/java/com/runrev/android/LiveCodeActivity.java
@@ -24,6 +24,7 @@
 import android.widget.*;
 import android.util.*;
 import android.content.pm.PackageManager;
+import android.graphics.*;
 
 // This is the main activity exported by the application. This is
 // split into two parts, a customizable sub-class that gets dynamically
@@ -76,6 +77,32 @@ protected void onCreate(Bundle p_saved_state)
         
         // prevent soft keyboard from resizing our view when shown
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+        
+        s_main_layout.getRootView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener()
+        {
+            @Override
+            public void onGlobalLayout()
+            {
+                // status bar height
+                int t_status_bar_height = 0;
+                int t_resource_id = getResources().getIdentifier("status_bar_height", "dimen", "android");
+                if (t_resource_id > 0)
+                {
+                    t_status_bar_height = getResources().getDimensionPixelSize(t_resource_id);
+                }
+                
+                // display window size for the app layout
+                Rect t_app_rect = new Rect();
+                getWindow().getDecorView().getWindowVisibleDisplayFrame(t_app_rect);
+                
+                int t_screen_height = s_main_layout.getRootView().getHeight();
+                
+                // keyboard height equals (screen height - (user app height + status))
+                int t_keyboard_height = t_screen_height - (t_app_rect.height() + t_status_bar_height);
+                
+                s_main_view.updateKeyboardVisible(t_keyboard_height > 0);
+            }
+        });
 	}
 
 	@Override
