prefer more official getMenuShortcutKeyMask, in deviation to traditional jEdit technique;
authorwenzelm
Sat, 15 Dec 2012 20:05:53 +0100
changeset 50553 ce0398b766ce
parent 50552 2b7fd8c9c4ac
child 50554 0493efcc97e9
prefer more official getMenuShortcutKeyMask, in deviation to traditional jEdit technique;
src/Tools/jEdit/src/rich_text_area.scala
--- a/src/Tools/jEdit/src/rich_text_area.scala	Sat Dec 15 18:30:09 2012 +0100
+++ b/src/Tools/jEdit/src/rich_text_area.scala	Sat Dec 15 20:05:53 2012 +0100
@@ -10,7 +10,7 @@
 
 import isabelle._
 
-import java.awt.{Graphics2D, Shape, Window, Color, Point}
+import java.awt.{Graphics2D, Shape, Window, Color, Point, Toolkit}
 import java.awt.event.{MouseMotionAdapter, MouseAdapter, MouseEvent,
   FocusAdapter, FocusEvent, WindowEvent, WindowAdapter}
 import java.awt.font.TextAttribute
@@ -168,7 +168,7 @@
   private val mouse_motion_listener = new MouseMotionAdapter {
     override def mouseMoved(e: MouseEvent) {
       robust_body(()) {
-        control = if (OperatingSystem.isMacOS()) e.isMetaDown else e.isControlDown
+        control = (e.getModifiers & Toolkit.getDefaultToolkit.getMenuShortcutKeyMask) != 0
 
         if ((control || hovering) && !buffer.isLoading) {
           JEdit_Lib.buffer_lock(buffer) {