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
Merge branch 'develop' into features/JAL-2435splitScreenFont
[jalview.git]
/
src
/
jalview
/
gui
/
FontChooser.java
diff --git
a/src/jalview/gui/FontChooser.java
b/src/jalview/gui/FontChooser.java
index
fdf3d2a
..
ec4ab49
100755
(executable)
--- a/
src/jalview/gui/FontChooser.java
+++ b/
src/jalview/gui/FontChooser.java
@@
-49,6
+49,12
@@
public class FontChooser extends GFontChooser
Font oldFont;
/*
Font oldFont;
/*
+ * The font on opening the dialog (to be restored on Cancel)
+ * on the other half of a split frame (if applicable)
+ */
+ Font oldComplementFont;
+
+ /*
* the state of 'scale protein as cDNA' on opening the dialog
*/
boolean oldProteinScale;
* the state of 'scale protein as cDNA' on opening the dialog
*/
boolean oldProteinScale;
@@
-114,6
+120,8
@@
public class FontChooser extends GFontChooser
boolean inSplitFrame = ap.av.getCodingComplement() != null;
if (inSplitFrame)
{
boolean inSplitFrame = ap.av.getCodingComplement() != null;
if (inSplitFrame)
{
+ oldComplementFont = ((AlignViewport) ap.av.getCodingComplement())
+ .getFont();
scaleAsCdna.setVisible(true);
scaleAsCdna.setSelected(ap.av.isScaleProteinAsCdna());
fontAsCdna.setVisible(true);
scaleAsCdna.setVisible(true);
scaleAsCdna.setSelected(ap.av.isScaleProteinAsCdna());
fontAsCdna.setVisible(true);
@@
-217,7
+225,11
@@
public class FontChooser extends GFontChooser
{
ap.av.getCodingComplement().setScaleProteinAsCdna(oldProteinScale);
ap.av.getCodingComplement().setProteinFontAsCdna(oldMirrorFont);
{
ap.av.getCodingComplement().setScaleProteinAsCdna(oldProteinScale);
ap.av.getCodingComplement().setProteinFontAsCdna(oldMirrorFont);
- ap.av.getCodingComplement().setFont(oldFont, true);
+ ap.av.getCodingComplement().setFont(oldComplementFont, true);
+ SplitFrame splitFrame = (SplitFrame) ap.alignFrame
+ .getSplitViewContainer();
+ splitFrame.adjustLayout();
+ splitFrame.repaint();
}
}
else if (tp != null)
}
}
else if (tp != null)
@@
-308,15
+320,14
@@
public class FontChooser extends GFontChooser
*/
ap.av.getCodingComplement().setFont(newFont, true);
}
*/
ap.av.getCodingComplement().setFont(newFont, true);
}
- if (fontAsCdna.isSelected() || scaleAsCdna.isSelected())
- {
- /*
- * adjust layout for font change and/or sizing
- */
- SplitFrame splitFrame = (SplitFrame) ap.alignFrame
- .getSplitViewContainer();
- splitFrame.repaint();
- }
+
+ /*
+ * adjust layout for font change / reset / sizing
+ */
+ SplitFrame splitFrame = (SplitFrame) ap.alignFrame
+ .getSplitViewContainer();
+ splitFrame.adjustLayout();
+ splitFrame.repaint();
}
}
}
}
@@
-405,8
+416,8
@@
public class FontChooser extends GFontChooser
/**
* Turn on/off mirroring of font across split frame. If turning on, also
/**
* Turn on/off mirroring of font across split frame. If turning on, also
- * copies the current font across the split frame. If turning off, does not
- * change fonts.
+ * copies the current font across the split frame. If turning off, restores
+ * the other half of the split frame to its initial font.
*/
@Override
protected void mirrorFonts_actionPerformed()
*/
@Override
protected void mirrorFonts_actionPerformed()
@@
-415,9
+426,14
@@
public class FontChooser extends GFontChooser
ap.av.setProteinFontAsCdna(selected);
ap.av.getCodingComplement().setProteinFontAsCdna(selected);
ap.av.setProteinFontAsCdna(selected);
ap.av.getCodingComplement().setProteinFontAsCdna(selected);
- if (selected)
+ /*
+ * reset other half of split frame if turning option off
+ */
+ if (!selected)
{
{
- changeFont();
+ ap.av.getCodingComplement().setFont(oldComplementFont, true);
}
}
+
+ changeFont();
}
}
}
}