JRE-100 IDEA-71508 revert a hack in the event queue

diff --git a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
index ac5aaf7098b5d875d49b9de9b352c36a17f42415..84ac9d1666279b62cb41c70cd00adaaece771b23 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
+++ b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
@@ -46,7 +46,6 @@ import com.intellij.util.ReflectionUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.io.storage.HeavyProcessLatch;
-import com.intellij.util.ui.MouseEventAdapter;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -317,27 +316,6 @@ public class IdeEventQueue extends EventQueue {
     return myCurrentEvent;
   }
 
-  private static class InertialMouseRouter {
-    private static final int MOUSE_WHEEL_RESTART_THRESHOLD = 50;
-    private static Component wheelDestinationComponent;
-    private static long lastMouseWheel;
-
-    @NotNull
-    private static AWTEvent changeSourceIfNeeded(@NotNull AWTEvent awtEvent) {
-      if (SystemInfo.isMac && Registry.is("ide.inertial.mouse.fix") && awtEvent instanceof MouseWheelEvent) {
-        MouseWheelEvent mwe = (MouseWheelEvent) awtEvent;
-        if (mwe.getWhen() - lastMouseWheel > MOUSE_WHEEL_RESTART_THRESHOLD) {
-          wheelDestinationComponent = SwingUtilities.getDeepestComponentAt(mwe.getComponent(), mwe.getX(), mwe.getY());
-        }
-        lastMouseWheel = System.currentTimeMillis();
-
-        int modifiers = mwe.getModifiers() | mwe.getModifiersEx();
-        return MouseEventAdapter.convert(mwe, wheelDestinationComponent, mwe.getID(), lastMouseWheel, modifiers, mwe.getX(), mwe.getY());
-      }
-      return awtEvent;
-    }
-  }
-
   private static boolean ourAppIsLoaded;
 
   private static boolean appIsLoaded() {
@@ -366,8 +344,6 @@ public class IdeEventQueue extends EventQueue {
       return;
     }
 
-    e = InertialMouseRouter.changeSourceIfNeeded(e);
-
     e = fixNonEnglishKeyboardLayouts(e);
 
     e = mapEvent(e);

diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 1e12206f655fa7a567ca62c90a47ac93c5cd0d33..d20cc0b91422c547384792b6115822b2c4e0009a 100644 (file)
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -614,9 +614,6 @@ focus.fix.lost.cursor.description=See IDEA-79312
 suppress.focus.stealing=false
 suppress.focus.stealing.description=(Experimental) Trying to fight focus stealing
 
-ide.inertial.mouse.fix=false
-ide.inertial.mouse.fix.description=See IDEA-71508
-
 ide.mouse.popup.trigger.modifiers.disabled=true
 ide.mouse.popup.trigger.modifiers.disabled.description=Do not show a context popup if right button is pressed with modifiers