From 855bc97b4d7036f4d30d40dd350e27a87d63b3ae Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Sat, 14 Jul 2018 10:41:11 +0200 Subject: [PATCH] Add setting to hide status text I found it particularly annoying to have the "Pondering on" text on top of the goban. --- src/main/java/featurecat/lizzie/Config.java | 3 +++ .../java/featurecat/lizzie/gui/LizzieFrame.java | 17 ++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/featurecat/lizzie/Config.java b/src/main/java/featurecat/lizzie/Config.java index 768910e99..14b5c155d 100644 --- a/src/main/java/featurecat/lizzie/Config.java +++ b/src/main/java/featurecat/lizzie/Config.java @@ -18,6 +18,7 @@ public class Config { public boolean showRawBoard = false; public boolean handicapInsteadOfWinrate = false; + public boolean showStatus = true; public boolean showBranch = true; public boolean showBestMoves = true; public boolean showNextMoves = true; @@ -133,6 +134,7 @@ public Config() throws IOException { uiConfig = config.getJSONObject("ui"); showMoveNumber = uiConfig.getBoolean("show-move-number"); + showStatus = uiConfig.getBoolean("show-status"); showBranch = uiConfig.getBoolean("show-leelaz-variation"); showWinrate = uiConfig.getBoolean("show-winrate"); showVariationGraph = uiConfig.getBoolean("show-variation-graph"); @@ -248,6 +250,7 @@ private JSONObject createDefaultConfig() { ui.put("fancy-board", true); ui.put("shadow-size", 100); ui.put("show-move-number", false); + ui.put("show-status", true); ui.put("show-leelaz-variation", true); ui.put("show-winrate", true); ui.put("show-variation-graph", true); diff --git a/src/main/java/featurecat/lizzie/gui/LizzieFrame.java b/src/main/java/featurecat/lizzie/gui/LizzieFrame.java index 172fc34a3..ad7b8f33e 100644 --- a/src/main/java/featurecat/lizzie/gui/LizzieFrame.java +++ b/src/main/java/featurecat/lizzie/gui/LizzieFrame.java @@ -115,7 +115,7 @@ public LizzieFrame() { variationTree = new VariationTree(); winrateGraph = new WinrateGraph(); - setMinimumSize( new Dimension(640,480) ); + setMinimumSize( new Dimension(640,480) ); setLocationRelativeTo(null); // start centered JSONArray windowSize = Lizzie.config.uiConfig.getJSONArray("window-size"); setSize(windowSize.getInt(0), windowSize.getInt(1)); // use config file window size @@ -373,16 +373,19 @@ public void paint(Graphics g0) { cachedImage = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_ARGB); Graphics2D g = (Graphics2D) cachedImage.getGraphics(); - drawCommandString(g); + if (Lizzie.config.showStatus) + drawCommandString(g); boardRenderer.setLocation(boardX, boardY); boardRenderer.setBoardLength(maxSize); boardRenderer.draw(g); if (Lizzie.leelaz != null && Lizzie.leelaz.isLoaded()) { - drawPonderingState(g, resourceBundle.getString("LizzieFrame.display.pondering") + - (Lizzie.leelaz.isPondering()?resourceBundle.getString("LizzieFrame.display.on"):resourceBundle.getString("LizzieFrame.display.off")), - ponderingX, ponderingY, ponderingSize); + if (Lizzie.config.showStatus) { + drawPonderingState(g, resourceBundle.getString("LizzieFrame.display.pondering") + + (Lizzie.leelaz.isPondering()?resourceBundle.getString("LizzieFrame.display.on"):resourceBundle.getString("LizzieFrame.display.off")), + ponderingX, ponderingY, ponderingSize); + } // Todo: Make board move over when there is no space beside the board if (Lizzie.config.showWinrate) { @@ -404,11 +407,11 @@ public void paint(Graphics g0) { // This can happen when no space is left for subboard. } } - } else { + } else if (Lizzie.config.showStatus) { drawPonderingState(g, resourceBundle.getString("LizzieFrame.display.loading"), loadingX, loadingY, loadingSize); } - drawCaptured(g, capx, capy, capw, caph); + drawCaptured(g, capx, capy, capw, caph) // cleanup g.dispose();