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

Fix font logic for search field rendering

Browse Source
This commit is contained in:
drdev
2014-08-16 16:59:41 +00:00
parent 05a28accc2
commit 6de1ca70d9
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java
View File

@@ -75,7 +75,6 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
public void setRatio(String ratio0) { public void setRatio(String ratio0) {
txtSearch.ratio = ratio0; txtSearch.ratio = ratio0;
txtSearch.ratioWidth = txtSearch.getFont().getBounds(ratio0).width;
} }
public String getCaption() { public String getCaption() {
@@ -87,7 +86,6 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
protected class SearchField extends FTextField { protected class SearchField extends FTextField {
private String ratio = "(0 / 0)"; private String ratio = "(0 / 0)";
private float ratioWidth;
private SearchField() { private SearchField() {
setFont(FONT); setFont(FONT);
@@ -97,7 +95,7 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
@Override @Override
protected float getRightPadding() { protected float getRightPadding() {
return ratioWidth + 2 * PADDING; return renderedFont.getBounds(ratio).width + 2 * PADDING;
} }
@Override @Override

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

@@ -327,6 +327,7 @@ public class FTextField extends FDisplayObject implements ITextField {
while (textBounds.width > availableTextWidth || textBounds.height > h) { while (textBounds.width > availableTextWidth || textBounds.height > h) {
if (renderedFont.canShrink()) { //shrink font to fit if possible if (renderedFont.canShrink()) { //shrink font to fit if possible
renderedFont = renderedFont.shrink(); renderedFont = renderedFont.shrink();
availableTextWidth = w - getLeftPadding() - getRightPadding();
textBounds = renderedFont.getMultiLineBounds(text); textBounds = renderedFont.getMultiLineBounds(text);
} }
else { else {
@@ -337,12 +338,6 @@ public class FTextField extends FDisplayObject implements ITextField {
//draw selection if key input is active //draw selection if key input is active
if (isEditing) { if (isEditing) {
float selLeft = getTextLeft(); float selLeft = getTextLeft();
if (alignment == HAlignment.CENTER) {
}
else if (alignment == HAlignment.RIGHT) {
}
if (selStart > 0) { if (selStart > 0) {
selLeft += renderedFont.getBounds(text.substring(0, selStart)).width; selLeft += renderedFont.getBounds(text.substring(0, selStart)).width;
} }