修复了文字显示不全的BUG

SaltyKitkat · Sep 22, 2020 · f010e2a · f010e2a
1 parent 46b8140
commit f010e2a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/src/main/java/com/b502/minedroid/utils/MapItem.java b/app/src/main/java/com/b502/minedroid/utils/MapItem.java
@@ -59,6 +59,8 @@ public void setButtonState(MapItem.State state) {
                 this.viewButton.setText("");
                 Drawable drawable = ContextCompat.getDrawable(this.getViewButton().getContext(), androidx.appcompat.R.drawable.abc_btn_colored_material);
                 this.viewButton.setBackground(drawable);
+                int tmp = this.viewButton.getCompoundDrawablePadding()+15;
+                this.viewButton.setPadding(tmp, tmp, tmp, tmp);
             } else if (state == MapItem.State.FLAGED) {
                 this.viewButton.setText("标");
             } else if (state == MapItem.State.OPENED) {

diff --git a/app/src/main/java/com/b502/minedroid/utils/MapManager.java b/app/src/main/java/com/b502/minedroid/utils/MapManager.java
@@ -307,11 +307,10 @@ void generateButtons() {
 
             for (int i = 1; i <= width; i++) {
                 AppCompatButton b = new AppCompatButton(context);
-                LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(getPixelsFromDp(buttonwidth), getPixelsFromDp(buttonwidth + 5));
-                lp.setMargins(-6, -6, 0, 0);
+                LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(getPixelsFromDp(buttonwidth - 2), getPixelsFromDp(buttonwidth + 3));
                 b.setLayoutParams(lp);
                 b.setTag(new int[]{i, j});
-                b.setPadding(1, 1, 1, 1);
+                //b.setPadding(1, 1, 1, 1);
                 // if (map[i][j].isMine)b.setText("雷");
                 //   else b.setText(Integer.toString(map[i][j].getMineCount()));
                 b.setOnClickListener(new View.OnClickListener() {