瀏覽代碼

0.0.47.beta11

kongzue 2 年之前
父節點
當前提交
b08c9bb636
共有 2 個文件被更改,包括 17 次插入12 次删除
  1. 16 11
      DialogX/src/main/java/com/kongzue/dialogx/util/views/DialogXBaseRelativeLayout.java
  2. 1 1
      gradle.properties

+ 16 - 11
DialogX/src/main/java/com/kongzue/dialogx/util/views/DialogXBaseRelativeLayout.java

@@ -167,21 +167,12 @@ public class DialogXBaseRelativeLayout extends RelativeLayout {
                         return insets;
                     }
                 });
+                paddingWindowInsetsByDefault();
             }else{
                 decorView.getViewTreeObserver().addOnGlobalLayoutListener(decorViewLayoutListener = new ViewTreeObserver.OnGlobalLayoutListener() {
                     @Override
                     public void onGlobalLayout() {
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                            paddingView(getRootWindowInsets());
-                        } else {
-                            if (BaseDialog.getTopActivity() == null) return;
-                            DisplayMetrics displayMetrics = new DisplayMetrics();
-                            ((Activity) BaseDialog.getTopActivity()).getWindowManager().getDefaultDisplay().getRealMetrics(displayMetrics);
-                            Rect rect = new Rect();
-                            View decorView = (View) getParent();
-                            decorView.getWindowVisibleDisplayFrame(rect);
-                            paddingView(rect.left, rect.top, displayMetrics.widthPixels - rect.right, displayMetrics.heightPixels - rect.bottom);
-                        }
+                        paddingWindowInsetsByDefault();
                     }
                 });
                 decorViewLayoutListener.onGlobalLayout();
@@ -194,6 +185,20 @@ public class DialogXBaseRelativeLayout extends RelativeLayout {
         }
     }
     
+    private void paddingWindowInsetsByDefault() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            paddingView(getRootWindowInsets());
+        } else {
+            if (BaseDialog.getTopActivity() == null) return;
+            DisplayMetrics displayMetrics = new DisplayMetrics();
+            ((Activity) BaseDialog.getTopActivity()).getWindowManager().getDefaultDisplay().getRealMetrics(displayMetrics);
+            Rect rect = new Rect();
+            View decorView = (View) getParent();
+            decorView.getWindowVisibleDisplayFrame(rect);
+            paddingView(rect.left, rect.top, displayMetrics.widthPixels - rect.right, displayMetrics.heightPixels - rect.bottom);
+        }
+    }
+    
     @Override
     protected void onDetachedFromWindow() {
         View decorView = (View) getParent();

+ 1 - 1
gradle.properties

@@ -19,5 +19,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.47.beta10
+BUILD_VERSION=0.0.47.beta11
 BUILD_VERSION_INT=46