From: <ha...@us...> - 2010-07-26 04:02:54
|
Revision: 13695 http://jmol.svn.sourceforge.net/jmol/?rev=13695&view=rev Author: hansonr Date: 2010-07-26 04:02:45 +0000 (Mon, 26 Jul 2010) Log Message: ----------- version=12.0.RC29_dev # bug fix: hover OFF not turning off bond hover Modified Paths: -------------- trunk/Jmol/src/org/jmol/shape/Sticks.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/shape/Sticks.java =================================================================== --- trunk/Jmol/src/org/jmol/shape/Sticks.java 2010-07-25 20:31:38 UTC (rev 13694) +++ trunk/Jmol/src/org/jmol/shape/Sticks.java 2010-07-26 04:02:45 UTC (rev 13695) @@ -242,7 +242,7 @@ Bond bond = findPickedBond(x, y, bsVisible, pt); if (bond == null) return false; - viewer.highlightBond(bond.getIndex()); + viewer.highlightBond(bond.getIndex(), true); return true; } Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-07-25 20:31:38 UTC (rev 13694) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-07-26 04:02:45 UTC (rev 13695) @@ -3,6 +3,8 @@ version=12.0.RC29_dev +# bug fix: hover OFF not turning off bond hover + # -------------------------------------------------------------- #version=12.0.RC28 Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2010-07-25 20:31:38 UTC (rev 13694) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2010-07-26 04:02:45 UTC (rev 13695) @@ -4468,7 +4468,7 @@ } public void hoverOn(int x, int y, String text) { - if (!hoverEnabled) + if (!isHoverEnabled()) return; // from draw for drawhover on if (eval != null && isScriptExecuting()) @@ -4486,7 +4486,7 @@ void hoverOff() { if (isModelKitMode()) highlight(null); - if (!hoverEnabled) + if (!isHoverEnabled()) return; boolean isHover = (hoverText != null || hoverAtomIndex >= 0); if (hoverAtomIndex >= 0) { @@ -7617,7 +7617,9 @@ movingSelected = false; } - public void highlightBond(int index) { + public void highlightBond(int index, boolean isHover) { + if (isHover && !isHoverEnabled()) + return; BitSet bs = null; if (index >= 0) { Bond b = modelSet.getBonds()[index]; @@ -7648,7 +7650,7 @@ if (index == Integer.MIN_VALUE) return; rotateBondIndex = index; - highlightBond(index); + highlightBond(index, false); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |