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

drawing-area: allow zooming in and out with keyboard

Browse source 
git-svn-id: https://micropolis.googlecode.com/svn/trunk/micropolis-java@762 d9718cc8-9f43-0410-858b-315f434eb58c
This commit is contained in:
jason@long.name 2013-07-21 15:34:36 +00:00
parent 45b84f0cbb
commit 1e21066cf2
1 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -182,6 +182,21 @@ public class MainWindow extends JFrame
setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
setLocationRelativeTo(null); setLocationRelativeTo(null);
getRootPane().getInputMap().put(KeyStroke.getKeyStroke("ADD"), "zoomIn");
getRootPane().getInputMap().put(KeyStroke.getKeyStroke("shift EQUALS"), "zoomIn");
getRootPane().getInputMap().put(KeyStroke.getKeyStroke("MINUS"), "zoomOut");
getRootPane().getActionMap().put("zoomIn", new AbstractAction() {
public void actionPerformed(ActionEvent evt) {
doZoom(1);
}
});
getRootPane().getActionMap().put("zoomOut", new AbstractAction() {
public void actionPerformed(ActionEvent evt) {
doZoom(-1);
}
});
MouseAdapter mouse = new MouseAdapter() { MouseAdapter mouse = new MouseAdapter() {
public void mousePressed(MouseEvent ev) public void mousePressed(MouseEvent ev)
{ {
@ -990,12 +1005,10 @@ public class MainWindow extends JFrame
notificationPane.showZoneStatus(engine, xpos, ypos, z); notificationPane.showZoneStatus(engine, xpos, ypos, z);
} }
private void onMouseWheelMoved(MouseWheelEvent evt) private void doZoom(int dir, Point mousePt)
{ {
boolean zoomOut = evt.getWheelRotation() > 0;
int oldZoom = drawingArea.getTileSize(); int oldZoom = drawingArea.getTileSize();
int newZoom = zoomOut ? (oldZoom / 2) : (oldZoom * 2); int newZoom = dir < 0 ? (oldZoom / 2) : (oldZoom * 2);
if (newZoom < 8) { newZoom = 8; } if (newZoom < 8) { newZoom = 8; }
if (newZoom > 32) { newZoom = 32; } if (newZoom > 32) { newZoom = 32; }
@ -1004,14 +1017,34 @@ public class MainWindow extends JFrame
// preserve effective mouse position in viewport when changing zoom level // preserve effective mouse position in viewport when changing zoom level
double f = (double)newZoom / (double)oldZoom; double f = (double)newZoom / (double)oldZoom;
Point pos = drawingAreaScroll.getViewport().getViewPosition(); Point pos = drawingAreaScroll.getViewport().getViewPosition();
int newX = (int)Math.round(evt.getX() * f - (evt.getX() - pos.x)); int newX = (int)Math.round(mousePt.x * f - (mousePt.x - pos.x));
int newY = (int)Math.round(evt.getY() * f - (evt.getY() - pos.y)); int newY = (int)Math.round(mousePt.y * f - (mousePt.y - pos.y));
drawingArea.selectTileSize(newZoom); drawingArea.selectTileSize(newZoom);
drawingAreaScroll.validate(); drawingAreaScroll.validate();
drawingAreaScroll.getViewport().setViewPosition(new Point(newX, newY)); drawingAreaScroll.getViewport().setViewPosition(new Point(newX, newY));
} }
} }
private void doZoom(int dir)
{
Rectangle rect = drawingAreaScroll.getViewport().getViewRect();
doZoom(dir,
new Point(rect.x + rect.width/2,
rect.y + rect.height/2
)
);
}
private void onMouseWheelMoved(MouseWheelEvent evt)
{
if (evt.getWheelRotation() < 0) {
doZoom(1, evt.getPoint());
}
else {
doZoom(-1, evt.getPoint());
}
}
// used when a tool is being pressed // used when a tool is being pressed
ToolStroke toolStroke; ToolStroke toolStroke;