From 6de1ca70d9568e566192b8d64ee2cf2be382522c Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sat, 16 Aug 2014 16:59:41 +0000
Subject: [PATCH] Fix font logic for search field rendering

---
 .../src/forge/itemmanager/filters/TextSearchFilter.java    | 4 +---
 forge-gui-mobile/src/forge/toolbox/FTextField.java         | 7 +------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java b/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java
index 585cd4c083b..b4d6fec1b46 100644
--- a/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java
+++ b/forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java
@@ -75,7 +75,6 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
 
     public void setRatio(String ratio0) {
         txtSearch.ratio = ratio0;
-        txtSearch.ratioWidth = txtSearch.getFont().getBounds(ratio0).width;
     }
 
     public String getCaption() {
@@ -87,7 +86,6 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
 
     protected class SearchField extends FTextField {
         private String ratio = "(0 / 0)";
-        private float ratioWidth;
 
         private SearchField() {
             setFont(FONT);
@@ -97,7 +95,7 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
 
         @Override
         protected float getRightPadding() {
-            return ratioWidth + 2 * PADDING;
+            return renderedFont.getBounds(ratio).width + 2 * PADDING;
         }
 
         @Override
diff --git a/forge-gui-mobile/src/forge/toolbox/FTextField.java b/forge-gui-mobile/src/forge/toolbox/FTextField.java
index 928169badda..6f94b42bb0d 100644
--- a/forge-gui-mobile/src/forge/toolbox/FTextField.java
+++ b/forge-gui-mobile/src/forge/toolbox/FTextField.java
@@ -327,6 +327,7 @@ public class FTextField extends FDisplayObject implements ITextField {
         while (textBounds.width > availableTextWidth || textBounds.height > h) {
             if (renderedFont.canShrink()) { //shrink font to fit if possible
                 renderedFont = renderedFont.shrink();
+                availableTextWidth = w - getLeftPadding() - getRightPadding();
                 textBounds = renderedFont.getMultiLineBounds(text);
             }
             else {
@@ -337,12 +338,6 @@ public class FTextField extends FDisplayObject implements ITextField {
         //draw selection if key input is active
         if (isEditing) {
             float selLeft = getTextLeft();
-            if (alignment == HAlignment.CENTER) {
-                
-            }
-            else if (alignment == HAlignment.RIGHT) {
-                
-            }
             if (selStart > 0) {
                 selLeft += renderedFont.getBounds(text.substring(0, selStart)).width;
             }