// 2.2.0-alpha2

Author: razerdp

README.md

@@ -319,6 +319,8 @@ QuickPopupBuilder支持链式调用生成一个基于QuickPopup的PopupWindow，
 ### 更新日志 ([历史更新](https://github.com/razerdp/BasePopup/blob/master/UpdateLog.md))
 
 * **【Candy】2.2.0**
+  * **【Candy】2.2.0-alpha2**(2019/03/21)
+    * 增加`setMaxWidth()`和`setMaxHeight()`方法，想最大半屏显示？走起~
   * **【Candy】2.2.0-alpha**(2019/03/21)
     * 增加`setBackgroundView(View)`方法，现在BasePopup的背景控件可以随意由你定制啦~当然PopupWindow的背景动画控制方法依旧生效
 

lib/build.gradle

@@ -35,7 +35,7 @@ def moduleName = 'BasePopup_Candy'
 
 
 group = "com.github.razerdp"
-version = "2.2.0-alpha"
+version = "2.2.0-alpha2"
 
 install {
     repositories.mavenInstaller {

lib/src/main/java/razerdp/basepopup/BasePopupHelper.java

@@ -108,6 +108,7 @@ final class BasePopupHelper implements PopupTouchController, PopupWindowActionLi
     private boolean isCustomMeasureWidth;
     private boolean isCustomMeasureHeight;
 
+    private int maxWidth, maxHeight;
 
     BasePopupHelper(PopupTouchController controller) {
         mAnchorViewLocation = new int[2];
@@ -617,6 +618,24 @@ BasePopupHelper setBackgroundView(View backgroundView) {
         return this;
     }
 
+    int getMaxWidth() {
+        return maxWidth;
+    }
+
+    BasePopupHelper setMaxWidth(int maxWidth) {
+        this.maxWidth = maxWidth;
+        return this;
+    }
+
+    int getMaxHeight() {
+        return maxHeight;
+    }
+
+    BasePopupHelper setMaxHeight(int maxHeight) {
+        this.maxHeight = maxHeight;
+        return this;
+    }
+
     //-----------------------------------------controller-----------------------------------------
     void handleShow() {
         //针对官方的坑（两个popup切换页面后重叠）

lib/src/main/java/razerdp/basepopup/BasePopupWindow.java

@@ -1761,6 +1761,15 @@ public BasePopupWindow setHeight(int height) {
         return this;
     }
 
+    public BasePopupWindow setMaxWidth(int maxWidth) {
+        mHelper.setMaxWidth(maxWidth);
+        return this;
+    }
+
+    public BasePopupWindow setMaxHeight(int maxHeight) {
+        mHelper.setMaxHeight(maxHeight);
+        return this;
+    }
     //------------------------------------------状态控制-----------------------------------------------
 
 

lib/src/main/java/razerdp/basepopup/PopupDecorViewProxy.java

@@ -217,17 +217,31 @@ private void measureWithIntercept(int widthMeasureSpec, int heightMeasureSpec) {
                 measureChild(child, MeasureSpec.makeMeasureSpec(getScreenWidth(), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(getScreenHeight(), MeasureSpec.EXACTLY));
             } else {
                 final LayoutParams lp = child.getLayoutParams();
+
+                int modeHeight = MeasureSpec.getMode(heightMeasureSpec);
+                if (mHelper.getMaxWidth() > 0) {
+                    int sizeWidth = MeasureSpec.getSize(widthMeasureSpec);
+                    if (sizeWidth > mHelper.getMaxWidth()) {
+                        widthMeasureSpec = MeasureSpec.makeMeasureSpec(mHelper.getMaxWidth(), MeasureSpec.EXACTLY);
+                    }
+                }
+
                 final int childWidthMeasureSpec = getChildMeasureSpec(widthMeasureSpec,
                         childLeftMargin + childRightMargin, lp.width);
                 int fixedHeightMeasureSpec = heightMeasureSpec;
                 //针对match_parent
                 if (mHelper.isClipToScreen() && mHelper.isShowAsDropDown() && lp.height == LayoutParams.MATCH_PARENT) {
-                    int mode = MeasureSpec.getMode(heightMeasureSpec);
                     int restContentHeight = getScreenHeight() - (mHelper.getAnchorY() + mHelper.getAnchorHeight()) - childTopMargin - childBottomMargin;
                     if (restContentHeight == 0) {
                         restContentHeight = MeasureSpec.getSize(heightMeasureSpec);
                     }
-                    fixedHeightMeasureSpec = MeasureSpec.makeMeasureSpec(restContentHeight, mode);
+                    fixedHeightMeasureSpec = MeasureSpec.makeMeasureSpec(restContentHeight, modeHeight);
+                }
+                if (mHelper.getMaxHeight() > 0) {
+                    int sizeHeight = MeasureSpec.getSize(fixedHeightMeasureSpec);
+                    if (sizeHeight > mHelper.getMaxHeight()) {
+                        fixedHeightMeasureSpec = MeasureSpec.makeMeasureSpec(mHelper.getMaxHeight(), MeasureSpec.EXACTLY);
+                    }
                 }
                 final int childHeightMeasureSpec = getChildMeasureSpec(fixedHeightMeasureSpec,
                         childTopMargin + childBottomMargin, lp.height);
@@ -249,6 +263,14 @@ private void measureWithOutIntercept(int widthMeasureSpec, int heightMeasureSpec
             if (child.getVisibility() != GONE) {
                 if (child == mTarget) {
                     final LayoutParams lp = child.getLayoutParams();
+
+                    if (mHelper.getMaxWidth() > 0) {
+                        int sizeWidth = MeasureSpec.getSize(widthMeasureSpec);
+                        if (sizeWidth > mHelper.getMaxWidth()) {
+                            widthMeasureSpec = MeasureSpec.makeMeasureSpec(mHelper.getMaxWidth(), MeasureSpec.EXACTLY);
+                        }
+                    }
+
                     int fixedHeightMeasureSpec = heightMeasureSpec;
                     if (mHelper.isClipToScreen() && mHelper.isShowAsDropDown() && lp.height == LayoutParams.MATCH_PARENT) {
                         int mode = MeasureSpec.getMode(heightMeasureSpec);
@@ -258,6 +280,14 @@ private void measureWithOutIntercept(int widthMeasureSpec, int heightMeasureSpec
                         }
                         fixedHeightMeasureSpec = MeasureSpec.makeMeasureSpec(restContentHeight, mode);
                     }
+
+                    if (mHelper.getMaxHeight() > 0) {
+                        int sizeHeight = MeasureSpec.getSize(fixedHeightMeasureSpec);
+                        if (sizeHeight > mHelper.getMaxHeight()) {
+                            fixedHeightMeasureSpec = MeasureSpec.makeMeasureSpec(mHelper.getMaxHeight(), MeasureSpec.EXACTLY);
+                        }
+                    }
+
                     final int childHeightMeasureSpec = getChildMeasureSpec(fixedHeightMeasureSpec,
                             childTopMargin + childBottomMargin, lp.height);