From da4c9bc623d0d4fa97fb415a8863958df4ddd3e1 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Fri, 8 Aug 2014 21:27:13 -0500 Subject: [PATCH] Wireless Terminal now has terminal mode, and size is fixed. --- client/gui/implementations/GuiMEMonitorable.java | 2 +- client/gui/implementations/GuiMEPortableCell.java | 5 +++++ client/gui/implementations/GuiWirelessTerm.java | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/client/gui/implementations/GuiMEMonitorable.java b/client/gui/implementations/GuiMEMonitorable.java index d7d74ad64..c95c59775 100644 --- a/client/gui/implementations/GuiMEMonitorable.java +++ b/client/gui/implementations/GuiMEMonitorable.java @@ -220,7 +220,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi .getSetting( Settings.SEARCH_MODE ) ) ); offset += 20; - if ( !(this instanceof GuiMEPortableCell) ) + if ( !(this instanceof GuiMEPortableCell) || this instanceof GuiWirelessTerm ) { buttonList.add( terminalStyleBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, AEConfig.instance.settings .getSetting( Settings.TERMINAL_STYLE ) ) ); diff --git a/client/gui/implementations/GuiMEPortableCell.java b/client/gui/implementations/GuiMEPortableCell.java index 75531f3b6..05f2ceb64 100644 --- a/client/gui/implementations/GuiMEPortableCell.java +++ b/client/gui/implementations/GuiMEPortableCell.java @@ -11,6 +11,11 @@ public class GuiMEPortableCell extends GuiMEMonitorable super( inventoryPlayer, te, new ContainerMEPortableCell( inventoryPlayer, null ) ); } + int defaultGetMaxRows() + { + return super.getMaxRows(); + } + @Override int getMaxRows() { diff --git a/client/gui/implementations/GuiWirelessTerm.java b/client/gui/implementations/GuiWirelessTerm.java index bc4eaebf1..e390f0990 100644 --- a/client/gui/implementations/GuiWirelessTerm.java +++ b/client/gui/implementations/GuiWirelessTerm.java @@ -11,4 +11,9 @@ public class GuiWirelessTerm extends GuiMEPortableCell maxRows = Integer.MAX_VALUE; } + @Override + int getMaxRows() + { + return defaultGetMaxRows(); + } }