From 09932e0f5d68d2e6a8bea6638c9ba61fbbc23a68 Mon Sep 17 00:00:00 2001 From: "jason@long.name" Date: Thu, 16 May 2013 23:46:21 +0000 Subject: [PATCH] toolstroke: suppress auto budget window when mouse is held down as soon as mouse is released, show the budget window git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@648 d9718cc8-9f43-0410-858b-315f434eb58c --- src/micropolisj/gui/MainWindow.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/micropolisj/gui/MainWindow.java b/src/micropolisj/gui/MainWindow.java index 8cf1b92..c6c4d9a 100644 --- a/src/micropolisj/gui/MainWindow.java +++ b/src/micropolisj/gui/MainWindow.java @@ -50,6 +50,7 @@ public class MainWindow extends JFrame boolean dirty1 = false; //indicates if a tool was successfully applied since last save boolean dirty2 = false; //indicates if simulator took a step since last save long lastSavedTime = 0; //real-time clock of when file was last saved + boolean autoBudgetPending; static ImageIcon appIcon; static { @@ -953,6 +954,11 @@ public class MainWindow extends JFrame } onToolHover(ev); + + if (autoBudgetPending) { + autoBudgetPending = false; + showBudgetWindow(true); + } } void previewTool() @@ -1110,7 +1116,7 @@ public class MainWindow extends JFrame if (!engine.autoBudget && engine.isBudgetTime()) { stopTimer(); //redundant - showBudgetWindow(true); + showAutoBudget(); return; } } @@ -1305,6 +1311,16 @@ public class MainWindow extends JFrame graphsPane.setVisible(true); } + private void showAutoBudget() + { + if (toolStroke == null) { + showBudgetWindow(true); + } + else { + autoBudgetPending = true; + } + } + private void showBudgetWindow(boolean isEndOfYear) { stopTimer();