git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2ef4aee
)
JAL-1211 - pick up site-defined defined window geometry before we calculate layout
author
Jim Procter
<jprocter@dundee.ac.uk>
Fri, 4 Apr 2014 15:18:24 +0000
(16:18 +0100)
committer
Jim Procter
<jprocter@dundee.ac.uk>
Fri, 4 Apr 2014 15:18:24 +0000
(16:18 +0100)
src/jalview/appletgui/AlignFrame.java
patch
|
blob
|
history
diff --git
a/src/jalview/appletgui/AlignFrame.java
b/src/jalview/appletgui/AlignFrame.java
index
638a68f
..
51df8b9
100644
(file)
--- a/
src/jalview/appletgui/AlignFrame.java
+++ b/
src/jalview/appletgui/AlignFrame.java
@@
-122,7
+122,28
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
{
ex.printStackTrace();
}
{
ex.printStackTrace();
}
-
+ // need to get window geometry before we calculate alignment layout
+ if (applet != null)
+ {
+ String param;
+ try
+ {
+ param = applet.getParameter("windowWidth");
+ if (param != null)
+ {
+ int width = Integer.parseInt(param);
+ DEFAULT_WIDTH = width;
+ }
+ param = applet.getParameter("windowHeight");
+ if (param != null)
+ {
+ int height = Integer.parseInt(param);
+ DEFAULT_HEIGHT = height;
+ }
+ } catch (Exception ex)
+ {
+ }
+ }
viewport = new AlignViewport(al, applet);
alignPanel = new AlignmentPanel(this, viewport);
avc = new jalview.controller.AlignViewController(this, viewport, alignPanel);
viewport = new AlignViewport(al, applet);
alignPanel = new AlignmentPanel(this, viewport);
avc = new jalview.controller.AlignViewController(this, viewport, alignPanel);
@@
-174,23
+195,6
@@
public class AlignFrame extends EmbmenuFrame implements ActionListener,
centreColumnLabelFlag.setState(true);
centreColumnLabelFlag_stateChanged();
}
centreColumnLabelFlag.setState(true);
centreColumnLabelFlag_stateChanged();
}
- try
- {
- param = applet.getParameter("windowWidth");
- if (param != null)
- {
- int width = Integer.parseInt(param);
- DEFAULT_WIDTH = width;
- }
- param = applet.getParameter("windowHeight");
- if (param != null)
- {
- int height = Integer.parseInt(param);
- DEFAULT_HEIGHT = height;
- }
- } catch (Exception ex)
- {
- }
}
if (viewport.getAlignment().isNucleotide())
}
if (viewport.getAlignment().isNucleotide())