external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix min button width on option pane

Browse Source
This commit is contained in:
drdev
2014-05-10 23:35:56 +00:00
parent 7113870546
commit ad907512bc
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui-mobile/src/forge/toolbox/FOptionPane.java
View File

@@ -19,6 +19,7 @@ public class FOptionPane extends FDialog {
public static final float PADDING = Utils.scaleMin(10); public static final float PADDING = Utils.scaleMin(10);
public static final float GAP_BELOW_BUTTONS = PADDING * 0.5f; public static final float GAP_BELOW_BUTTONS = PADDING * 0.5f;
public static final float BUTTON_HEIGHT = Utils.AVG_FINGER_HEIGHT * 0.75f; public static final float BUTTON_HEIGHT = Utils.AVG_FINGER_HEIGHT * 0.75f;
public static final float MIN_BUTTON_WIDTH = Utils.scaleX(120);
public static float getMaxDisplayObjHeight() { public static float getMaxDisplayObjHeight() {
return Forge.getCurrentScreen().getHeight() - 2 * VPrompt.HEIGHT - FDialog.TITLE_HEIGHT - return Forge.getCurrentScreen().getHeight() - 2 * VPrompt.HEIGHT - FDialog.TITLE_HEIGHT -
@@ -204,7 +205,7 @@ public class FOptionPane extends FDialog {
if (promptHeight > maxPromptHeight) { if (promptHeight > maxPromptHeight) {
promptHeight = maxPromptHeight; promptHeight = maxPromptHeight;
} }
lblIcon.setBounds(x - 3, y, labelWidth, promptHeight); lblIcon.setBounds(x - Utils.scaleX(3), y, labelWidth, promptHeight);
x += labelWidth; x += labelWidth;
} }
if (prompt != null) { if (prompt != null) {
@@ -240,8 +241,8 @@ public class FOptionPane extends FDialog {
maxButtonWidth = buttonWidth; maxButtonWidth = buttonWidth;
} }
} }
float gapBetween = -2; //use negative so buttons closer together float gapBetween = Utils.scaleX(-2); //use negative so buttons closer together
float buttonWidth = Math.max(maxButtonWidth, 120); //account for margins and enforce minimum width float buttonWidth = Math.max(maxButtonWidth, MIN_BUTTON_WIDTH); //account for margins and enforce minimum width
float dx = buttonWidth + gapBetween; float dx = buttonWidth + gapBetween;
float totalButtonWidth = dx * buttons.length - gapBetween; float totalButtonWidth = dx * buttons.length - gapBetween;