Merge pull request #116 from koma999/issue111-HeightMeasurement

Height measurement fixes
QuadFlask · Nov 7, 2019 · a5b4c7f · a5b4c7f
2 parents 0963cb8 + 42c855e
commit a5b4c7f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/library/src/main/java/com/flask/colorpicker/ColorPickerView.java b/library/src/main/java/com/flask/colorpicker/ColorPickerView.java
@@ -210,10 +210,10 @@ else if (widthMode == MeasureSpec.EXACTLY)
 		int heightMode = MeasureSpec.getMode(heightMeasureSpec);
 		int height = 0;
 		if (heightMode == MeasureSpec.UNSPECIFIED)
-			height = widthMeasureSpec;
+			height = heightMeasureSpec;
 		else if (heightMode == MeasureSpec.AT_MOST)
 			height = MeasureSpec.getSize(heightMeasureSpec);
-		else if (widthMode == MeasureSpec.EXACTLY)
+		else if (heightMode == MeasureSpec.EXACTLY)
 			height = MeasureSpec.getSize(heightMeasureSpec);
 		int squareDimen = width;
 		if (height < width)