X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.g3d%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fproperty%2FAnnotatedPropertyTabContributorFactory.java;fp=org.simantics.g3d%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fproperty%2FAnnotatedPropertyTabContributorFactory.java;h=3fcb19f5e21f62fe11b9ab028e6ce6ce62f35bc4;hb=ad4cf963d836f3d15c8d6d0c738e3886d3342f3f;hp=15b787d6d91781b8177e5b824c71eb4860cd611d;hpb=e5d47e2e8dec89c834322ce1e33a9f0c4ef330a1;p=simantics%2F3d.git

diff --git a/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java b/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java
index 15b787d6..3fcb19f5 100644
--- a/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java
@@ -599,23 +599,12 @@ public class AnnotatedPropertyTabContributorFactory implements PropertyTabContri
 			}
 			ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(
 					viewer) {
-				Object lastSource = null;
-				int clickCount = 0;
-				
 				protected boolean isEditorActivationEvent(
 						ColumnViewerEditorActivationEvent event) {
-					if (!event.getSource().equals(lastSource))
-						clickCount = 0;
-					
-					lastSource = event.getSource();
-					
-					if (event.eventType == ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION)
-						clickCount += 1;
-						
 					return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL
+							|| event.eventType == ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION
 							|| event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION
-							|| event.eventType == ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION && clickCount >= 2
-							|| (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SWT.CR)
+							|| (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && (event.keyCode == SWT.CR || event.keyCode == SWT.F2))
 							|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC;
 				}
 			};