small fix

Actelion · Oct 10, 2024 · 8a64239 · 8a64239
1 parent fa90e89
commit 8a64239
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/com/actelion/research/chem/Molecule.java b/src/main/java/com/actelion/research/chem/Molecule.java
@@ -3475,8 +3475,9 @@ public void setBondQueryFeature(int bond, int feature, boolean value) {
 			mBondQueryFeatures[bond] |= feature;
 		else
 			mBondQueryFeatures[bond] &= ~feature;
-		mValidHelperArrays = cHelperNone;	// there is an influence on occipied valence, bond order, etc.
-		mIsFragment = true;
+		mValidHelperArrays = cHelperNone;	// there is an influence on occupied valence, bond order, etc.
+		if (value && feature != 0)
+			mIsFragment = true;
 		}
 
 

diff --git a/src/main/java/com/actelion/research/gui/editor/BondQueryFeatureDialogBuilder.java b/src/main/java/com/actelion/research/gui/editor/BondQueryFeatureDialogBuilder.java
@@ -313,11 +313,6 @@ private void setQueryFeatures(int bond) {
 				queryFeatures |= Molecule.cBondQFQuadruple;
 				selectionCount++;
 				}
-			if (mCBDelocalized.isSelected()) {
-				bondType = Molecule.cBondTypeDelocalized;
-				queryFeatures |= Molecule.cBondQFDelocalized;
-				selectionCount++;
-				}
 			if (mCBTriple.isSelected()) {
 				bondType = Molecule.cBondTypeTriple;
 				queryFeatures |= Molecule.cBondQFTriple;
@@ -328,6 +323,11 @@ private void setQueryFeatures(int bond) {
 				queryFeatures |= Molecule.cBondQFDouble;
 				selectionCount++;
 				}
+			if (mCBDelocalized.isSelected()) {
+				bondType = Molecule.cBondTypeDelocalized;
+				queryFeatures |= Molecule.cBondQFDelocalized;
+				selectionCount++;
+				}
 			if (mCBSingle.isSelected()) {
 				bondType = Molecule.cBondTypeSingle;
 				queryFeatures |= Molecule.cBondQFSingle;

diff --git a/src/main/java/com/actelion/research/gui/editor/GenericEditorToolbar.java b/src/main/java/com/actelion/research/gui/editor/GenericEditorToolbar.java
@@ -135,8 +135,8 @@ public void setCurrentTool(int tool) {
 	public void paintContent(GenericDrawContext context) {
 		int background = mToolbarCanvas.getBackgroundRGB();
 		boolean isDark = (ColorHelper.perceivedBrightness(background) < 0.5);
-		int highlightBackground = isDark ? ColorHelper.brighter(background, 0.6f) : ColorHelper.darker(background, 0.6f);
-		int selectedBackground = isDark ? ColorHelper.brighter(background, 0.8f) : ColorHelper.darker(background, 0.8f);
+		int highlightBackground = isDark ? ColorHelper.brighter(background, 0.3f) : ColorHelper.darker(background, 0.6f);
+		int selectedBackground = isDark ? ColorHelper.brighter(background, 0.5f) : ColorHelper.darker(background, 0.8f);
 
 		int sw = mImageNormal.getWidth();
 		int sh = mImageNormal.getHeight();