git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3210 small tidies
[jalview.git]
/
src
/
jalview
/
appletgui
/
RotatableCanvas.java
diff --git
a/src/jalview/appletgui/RotatableCanvas.java
b/src/jalview/appletgui/RotatableCanvas.java
index
2a49d0b
..
34f8ea5
100755
(executable)
--- a/
src/jalview/appletgui/RotatableCanvas.java
+++ b/
src/jalview/appletgui/RotatableCanvas.java
@@
-392,13
+392,37
@@
public class RotatableCanvas extends Panel implements MouseListener,
@Override
public void keyPressed(KeyEvent evt)
{
@Override
public void keyPressed(KeyEvent evt)
{
- if (evt.getKeyCode() == KeyEvent.VK_UP)
+ boolean shiftDown = evt.isShiftDown();
+ int keyCode = evt.getKeyCode();
+ if (keyCode == KeyEvent.VK_UP)
{
{
- zoom(1.1f);
+ if (shiftDown)
+ {
+ rotate(0f, -1f);
+ }
+ else
+ {
+ zoom(1.1f);
+ }
+ }
+ else if (keyCode == KeyEvent.VK_DOWN)
+ {
+ if (shiftDown)
+ {
+ rotate(0f, 1f);
+ }
+ else
+ {
+ zoom(0.9f);
+ }
+ }
+ else if (shiftDown && keyCode == KeyEvent.VK_LEFT)
+ {
+ rotate(1f, 0f);
}
}
- else if (evt.getKeyCode() == KeyEvent.VK_DOWN)
+ else if (shiftDown && keyCode == KeyEvent.VK_RIGHT)
{
{
- zoom(0.9f);
+ rotate(-1f, 0f);
}
else if (evt.getKeyChar() == 's')
{
}
else if (evt.getKeyChar() == 's')
{