// TODO: consider waiting until the structure/view is fully loaded before
// displaying
this.getContentPane().add(renderPanel, java.awt.BorderLayout.CENTER);
+ this.invalidate();
+ this.pack();
jalview.gui.Desktop.addInternalFrame(this, jmb.getViewerTitle(),
getBounds().width, getBounds().height);
if (scriptWindow == null)
for (String s : files)
{
fileList.append(SPACE).append(QUOTE)
- .append(Platform.escapeString(s)).append(QUOTE);
+ .append(Platform.escapeBackslashes(s)).append(QUOTE);
}
String filesString = fileList.toString();
addingStructures = true; // already files loaded.
for (int c = 0; c < filesInViewer.length; c++)
{
- if (filesInViewer[c].equals(file))
+ if (Platform.pathEquals(filesInViewer[c], file))
{
file = null;
break;
*
* @param type
*/
+ @Override
public void makePDBImage(ImageMaker.TYPE type)
{
int width = getWidth();
validate();
}
+ @SuppressWarnings("serial")
class RenderPanel extends JPanel
{
final Dimension currentSize = new Dimension();
+ public RenderPanel()
+ {
+ setPreferredSize(
+ Cache.getDefaultDim(Preferences.STRUCTURE_DIMENSIONS,
+ Preferences.DEFAULT_STRUCTURE_DIMENSIONS));
+ // BH 2019.07.12 suggesting 600,600; current is something like 347 x 323
+ }
+
@Override
public void paintComponent(Graphics g)
{
getSize(currentSize);
-
+ // BH: Note that this size could be slightly different from the size set
+ // prior to packing.
if (jmb != null && jmb.hasFileLoadingError())
{
g.setColor(Color.black);