IDEA-163604 command + mouse wheel zoom stops working intermittently on macOS
authorSergey Malenkov <sergey.malenkov@jetbrains.com>
Wed, 16 Nov 2016 13:58:21 +0000 (16:58 +0300)
committerSergey Malenkov <sergey.malenkov@jetbrains.com>
Wed, 16 Nov 2016 18:34:26 +0000 (21:34 +0300)
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java

index a34fbdaf153278b01dce2e91081a0cce3c14edc1..486545a219375852ff54d0e03432cb4587da63bf 100644 (file)
@@ -30,7 +30,6 @@ import com.intellij.ide.ui.customization.CustomActionsSchema;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
-import com.intellij.openapi.actionSystem.impl.MouseGestureManager;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.application.TransactionGuard;
@@ -7235,7 +7234,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
 
     @Override
     protected void processMouseWheelEvent(@NotNull MouseWheelEvent e) {
-      if (mySettings.isWheelFontChangeEnabled() && !MouseGestureManager.getInstance().hasTrackpad()) {
+      if (mySettings.isWheelFontChangeEnabled()) {
         if (EditorUtil.isChangeFontSize(e)) {
           int size = myScheme.getEditorFontSize() - e.getWheelRotation();
           if (size >= MIN_FONT_SIZE) {