diff -r 3952eebda714 -r ee41e156d189 Tools__CodeNavigationService.st
--- a/Tools__CodeNavigationService.st	Mon Feb 24 17:12:29 2014 +0100
+++ b/Tools__CodeNavigationService.st	Mon Feb 24 19:35:31 2014 +0100
@@ -67,7 +67,6 @@
 "
 ! !
 
-
 !CodeNavigationService class methodsFor:'accessing'!
 
 label
@@ -281,7 +280,7 @@
      If the method returns true, the event will not be processed
      by the view."
     
-    (view == textView and:[ textView sensor metaDown ]) ifTrue:[
+    (view == textView and:[ textView isQuickMenuModifierPressed ]) ifTrue:[
         self highlightElementAtX:x y:y.
         ^ true
     ].
@@ -292,7 +291,6 @@
 !
 
 buttonPress: button x:x y:y in: view
-
     "Handles an event in given view (a subview of codeView).
      If the method returns true, the event will not be processed
      by the view."
@@ -716,13 +714,10 @@
 !
 
 highlightElementAtX:x y:y 
-    |visibleLine line col|
+    |elementOrNil|
 
-    codeView syntaxElements isNil ifTrue:[^self].
-    visibleLine := textView visibleLineOfY:y.
-    col := textView colOfX:x inVisibleLine:visibleLine.
-    line := textView visibleLineToAbsoluteLine:visibleLine.
-    self highlightElementAtLine:line col:col
+    elementOrNil := self elementAtX:x y:y.
+    self highlightElement:elementOrNil
 
     "Created: / 14-02-2010 / 16:12:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 06-03-2010 / 20:06:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -840,14 +835,14 @@
 !CodeNavigationService class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.42 2014-02-15 21:17:30 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.43 2014-02-24 18:35:31 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.42 2014-02-15 21:17:30 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeNavigationService.st,v 1.43 2014-02-24 18:35:31 stefan Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeNavigationService.st,v 1.42 2014-02-15 21:17:30 vrany Exp $'
+    ^ '$Id: Tools__CodeNavigationService.st,v 1.43 2014-02-24 18:35:31 stefan Exp $'
 ! !