diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java index 2f27fe79210..8885c1a60cc 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java @@ -40,9 +40,7 @@ public abstract class FormatFilter extends ListLabelFil } //use HTML tooltips so we can insert line breaks - int lastLen = 0; - int lineLen = 0; - StringBuilder tooltip = new StringBuilder("Sets:"); + StringBuilder tooltip = new StringBuilder("Sets:"); if (sets.isEmpty()) { tooltip.append(" All"); } @@ -50,47 +48,28 @@ public abstract class FormatFilter extends ListLabelFil CardEdition.Collection editions = FModel.getMagicDb().getEditions(); for (String code : sets) { - // don't let a single line get too long - if (50 < lineLen) { - tooltip.append("
"); - lastLen += lineLen; - lineLen = 0; - } - CardEdition edition = editions.get(code); tooltip.append(" ").append(edition.getName()).append(" (").append(code).append("),"); - lineLen = tooltip.length() - lastLen; } // chop off last comma tooltip.delete(tooltip.length() - 1, tooltip.length()); if (this.allowReprints) { - tooltip.append("

Allowing identical cards from other sets"); + tooltip.append("\n\nAllowing identical cards from other sets."); } } if (!bannedCards.isEmpty()) { - tooltip.append("

Banned:"); - lastLen += lineLen; - lineLen = 0; + tooltip.append("\n\nBanned:"); for (String cardName : bannedCards) { - // don't let a single line get too long - if (50 < lineLen) { - tooltip.append("
"); - lastLen += lineLen; - lineLen = 0; - } - tooltip.append(" ").append(cardName).append(";"); - lineLen = tooltip.length() - lastLen; } // chop off last semicolon tooltip.delete(tooltip.length() - 1, tooltip.length()); } - tooltip.append(""); return tooltip.toString(); } diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java index dcb8a26a95c..f9e59fc407e 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java @@ -54,7 +54,7 @@ public abstract class ListLabelFilter extends ItemFilte @Override protected void doWidgetLayout(LayoutHelper helper) { - helper.fillLine(label, FTextField.getDefaultHeight()); + helper.fillLine(label, helper.getParentHeight()); } private class ListLabel extends FLabel { @@ -65,7 +65,7 @@ public abstract class ListLabelFilter extends ItemFilte @Override public boolean tap(float x, float y, int count) { FTooltip tooltip = new FTooltip(getTooltip()); - tooltip.show(this, x, y); + tooltip.show(this, x, getHeight()); return true; } } diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java index 7a0f529efbf..b4f3a074bcf 100644 --- a/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java +++ b/forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java @@ -83,7 +83,7 @@ public abstract class ValueRangeFilter extends ItemFilt @Override protected void doWidgetLayout(LayoutHelper helper) { - float height = lowerBound.getHeight(); + float height = helper.getParentHeight(); helper.include(lowerBound, 45, height); helper.include(label, 125, height); helper.include(upperBound, 45, height);