瀏覽代碼

Updates and fixes

Aidan Follestad 10 年之前
父節點
當前提交
d183b4fed2

+ 3 - 11
library/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -426,40 +426,32 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
         Log.v("MD_Stacking", "Max button width: " + maxWidth);
         final Paint paint = positiveButton.getPaint();
         final int eightDp = (int) getContext().getResources().getDimension(R.dimen.md_button_padding_horizontal_external);
-        int totalWidth = 0;
         isStacked = false;
 
         if (this.positiveText != null) {
-            final int positiveWidth = (int) paint.measureText(positiveButton.getText().toString()) + (eightDp * 2);
+            final int positiveWidth = (int) paint.measureText(positiveButton.getText().toString()) + eightDp;
             isStacked = positiveWidth > maxWidth;
-            totalWidth += positiveWidth;
             Log.v("MD_Stacking", "Positive button width: " + positiveWidth);
         } else {
             Log.v("MD_Stacking", "No positive button");
         }
 
         if (!isStacked && this.neutralText != null) {
-            final int neutralWidth = (int) paint.measureText(neutralButton.getText().toString()) + (eightDp * 2);
+            final int neutralWidth = (int) paint.measureText(neutralButton.getText().toString()) + eightDp;
             isStacked = neutralWidth > maxWidth;
-            totalWidth += neutralWidth;
             Log.v("MD_Stacking", "Neutral button width: " + neutralWidth);
         } else {
             Log.v("MD_Stacking", "No neutral button or already stacked");
         }
 
         if (!isStacked && this.negativeText != null) {
-            final int negativeWidth = (int) paint.measureText(negativeButton.getText().toString()) + (eightDp * 2);
+            final int negativeWidth = (int) paint.measureText(negativeButton.getText().toString()) + eightDp;
             isStacked = negativeWidth > maxWidth;
-            totalWidth += negativeWidth;
             Log.v("MD_Stacking", "Negative button width: " + negativeWidth);
         } else {
             Log.v("MD_Stacking", "No negative button or already stacked");
         }
 
-        if (!isStacked && totalWidth > maxWidth) {
-            isStacked = true;
-        }
-
         invalidateActions();
     }
 

+ 2 - 1
library/src/main/res/layout/md_dialog.xml

@@ -124,7 +124,8 @@
                 android:scrollbarStyle="outsideOverlay"
                 android:clipToPadding="false"
                 android:divider="@null"
-                android:dividerHeight="0dp" />
+                android:dividerHeight="0dp"
+                android:listSelector="@null" />
 
         </LinearLayout>