From 02b0fd2d63c4865a32486bc70839d6abf49af42c Mon Sep 17 00:00:00 2001 From: drdev Date: Mon, 28 Apr 2014 03:04:36 +0000 Subject: [PATCH] Tweak item manager filter layout --- .../src/forge/itemmanager/ItemManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index 483ef11096c..938ebcdf224 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -271,7 +271,7 @@ public abstract class ItemManager extends FContainer im @Override public void doLayout(float width, float height) { - LayoutHelper helper = new LayoutHelper(this, ItemFilter.PADDING, 1); + LayoutHelper helper = new LayoutHelper(this, ItemFilter.PADDING, 0); if (!hideFilters) { for (ItemFilter filter : orderedFilters) { helper.fillLine(filter.getPanel(), ItemFilter.PANEL_HEIGHT); @@ -280,7 +280,7 @@ public abstract class ItemManager extends FContainer im helper.fillLine(mainSearchFilter.getPanel(), ItemFilter.PANEL_HEIGHT); } helper.newLine(ItemFilter.PADDING); - float fieldHeight = mainSearchFilter.getWidget().getHeight(); + float fieldHeight = mainSearchFilter.getMainComponent().getHeight(); helper.include(btnFilters, 61, fieldHeight); float captionWidth = lblCaption.getAutoSizeBounds().width; float ratioWidth = lblRatio.getAutoSizeBounds().width; @@ -294,16 +294,16 @@ public abstract class ItemManager extends FContainer im helper.include(lblCaption, captionWidth, fieldHeight); helper.offset(-helper.getGapX(), 0); helper.fillLine(lblRatio, fieldHeight, (viewButtonWidth + helper.getGapX()) * viewButtonCount - viewButtonCount + 1); //leave room for view buttons - helper.offset(0, -1); + helper.offset(0, -1); //shift buttons upward for (ItemView view : views) { helper.include(view.getButton(), viewButtonWidth, fieldHeight); helper.offset(-1, 0); } helper.include(btnViewOptions, viewButtonWidth, fieldHeight); - helper.newLine(1); + helper.newLine(2); if (currentView.getPnlOptions().isVisible()) { helper.fillLine(currentView.getPnlOptions(), fieldHeight + 4); - helper.newLine(2); + helper.newLine(3); } helper.fill(currentView.getScroller()); }