diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java index d193441d145..2a3983b01c8 100644 --- a/src/main/java/forge/game/GameNew.java +++ b/src/main/java/forge/game/GameNew.java @@ -346,6 +346,13 @@ public class GameNew { private static void newMatchCleanup() { if (Singletons.getModel().getMatchState().getGamesPlayedCount() != 0) { return; } + // Toggle dev mode panel; should probably be moved somehwere else after + // match UI refactor. + if (Constant.Runtime.DEV_MODE[0]) { Singletons.getView().getViewMatch() + .getViewTabber().getVtpTabber().getAllVTabs().get(4).setVisible(true); } + else { Singletons.getView().getViewMatch() + .getViewTabber().getVtpTabber().getAllVTabs().get(4).setVisible(false); } + AllZone.getInputControl().resetInput(); Singletons.getModel().getMatchState().reset(); Singletons.getModel().loadPrefs(); diff --git a/src/main/java/forge/view/match/ViewTabber.java b/src/main/java/forge/view/match/ViewTabber.java index 8c6f297dff2..7cc4b813ad6 100644 --- a/src/main/java/forge/view/match/ViewTabber.java +++ b/src/main/java/forge/view/match/ViewTabber.java @@ -48,7 +48,6 @@ import net.miginfocom.swing.MigLayout; import forge.AllZone; import forge.CardList; import forge.CardUtil; -import forge.Constant; import forge.Constant.Zone; import forge.GameLog; import forge.MagicStack; @@ -143,10 +142,7 @@ public class ViewTabber extends JPanel { this.pnlDev.setOpaque(false); this.pnlDev.setLayout(new MigLayout(constraints)); this.pnlDev.setToolTipText("Developer Mode"); - - if (Constant.Runtime.DEV_MODE[0]) { - this.panelList.add(this.pnlDev); - } + this.panelList.add(this.pnlDev); // Populate the various panels in the tabber. this.populatePnlDev(); @@ -396,12 +392,6 @@ public class ViewTabber extends JPanel { jsp.getViewport().setOpaque(false); this.pnlConsole.add(jsp, "w 95%!, gapleft 3%, gaptop 1%"); - - /* - * We do not need to keep track for now. In the future, we may need this - * if we change how the log is displayed. - */ - // consoleTARs.add(tar); } /** diff --git a/src/main/java/forge/view/toolbox/FVerticalTabPanel.java b/src/main/java/forge/view/toolbox/FVerticalTabPanel.java index 42decfb32c0..ef6d9570a89 100644 --- a/src/main/java/forge/view/toolbox/FVerticalTabPanel.java +++ b/src/main/java/forge/view/toolbox/FVerticalTabPanel.java @@ -126,7 +126,7 @@ public class FVerticalTabPanel extends JPanel { } this.add(tab, "w " + pctTabW + "%!, h " + pctTabH + "%!," - + " gap 0 0 " + pctSpacing + " " + pctSpacing + "%!"); + + " gap 0 0 " + pctSpacing + " " + pctSpacing + "%!, ay center"); this.allVTabs.add(tab); // Add card to content panel