archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

toolstroke: uniform mechanism for keeping tool cursor updated

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@644 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-05-16 23:45:25 +00:00
parent 082e05f63c
commit d0a6bb2303
2 changed files with 42 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/micropolisj/gui/MainWindow.java
View file

@ -23,7 +23,6 @@ import javax.swing.Timer;
import javax.swing.filechooser.FileNameExtensionFilter;
import micropolisj.engine.*;
import static micropolisj.gui.ColorParser.parseColor;
public class MainWindow extends JFrame
implements Micropolis.Listener, EarthquakeListener
@ -949,6 +948,8 @@ public class MainWindow extends JFrame
showToolResult(loc, tr);
toolStroke = null;
}
onToolHover(ev);
}
private void onToolDrag(MouseEvent ev)
@ -965,9 +966,9 @@ public class MainWindow extends JFrame
if (toolStroke != null) {
toolStroke.dragTo(x, y);
drawingArea.setToolPreview(
drawingArea.setToolCursor(
toolStroke.getBounds(),
parseColor(strings.getString("tool."+currentTool.name()+".border"))
currentTool
);
}
else if (currentTool == MicropolisTool.QUERY) {
@ -982,7 +983,7 @@ public class MainWindow extends JFrame
{
if (currentTool == null || currentTool == MicropolisTool.QUERY)
{
drawingArea.setToolPreview(null);
drawingArea.setToolCursor(null);
return;
}
@ -996,15 +997,12 @@ public class MainWindow extends JFrame
if (h >= 3)
y--;
drawingArea.setToolPreview(new Rectangle(x,y,w,h),
parseColor(strings.getString("tool."+currentTool.name()+".border"))
);
drawingArea.toolPreview.fillColor = parseColor(strings.getString("tool."+currentTool.name()+".bgcolor"));
drawingArea.setToolCursor(new Rectangle(x,y,w,h), currentTool);
}
private void onToolExited(MouseEvent ev)
{
drawingArea.setToolPreview(null);
drawingArea.setToolCursor(null);
}
private void showToolResult(CityLocation loc, ToolResult result)