From d9290f4882c9f1f456daa88fc0fb2476b57d0b3d Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Fri, 30 Jun 2023 17:36:26 +0200
Subject: [PATCH] Mac: enable force-touch in keymap settings again
 (IDEA-192405)

GitOrigin-RevId: 3424df7b3097f8cad26306c88c3c8d76f407499f
---
 ...acGestureSupportForMouseShortcutPanel.java | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/mac/MacGestureSupportForMouseShortcutPanel.java b/platform/platform-impl/src/com/intellij/ui/mac/MacGestureSupportForMouseShortcutPanel.java
index 089aae4006ef..39cf55549556 100644
--- a/platform/platform-impl/src/com/intellij/ui/mac/MacGestureSupportForMouseShortcutPanel.java
+++ b/platform/platform-impl/src/com/intellij/ui/mac/MacGestureSupportForMouseShortcutPanel.java
@@ -10,25 +10,24 @@ import com.apple.eawt.event.GestureUtilities;
 import com.apple.eawt.event.PressureEvent;
 import com.apple.eawt.event.PressureListener;
 import com.intellij.openapi.actionSystem.PressureShortcut;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.keymap.impl.ui.MouseShortcutPanel;
-import com.intellij.openapi.util.SystemInfo;
-import com.intellij.util.lang.JavaVersion;
 
 public final class MacGestureSupportForMouseShortcutPanel {
   public MacGestureSupportForMouseShortcutPanel(MouseShortcutPanel panel, Runnable runnable) {
-    //todo[kb]: return pressure listener to jbr17
-    if (SystemInfo.isJetBrainsJvm && JavaVersion.current().isAtLeast(17)) {
-      return;
-    }
-    GestureListener pressureListener = new PressureListener() {
-      @Override
-      public void pressure(PressureEvent e) {
-        if (e.getStage() == 2) {
-          panel.setShortcut(new PressureShortcut(e.getStage()));
-          runnable.run();
+    try {
+      GestureListener pressureListener = new PressureListener() {
+        @Override
+        public void pressure(PressureEvent e) {
+          if (e.getStage() == 2) {
+            panel.setShortcut(new PressureShortcut(e.getStage()));
+            runnable.run();
+          }
         }
-      }
-    };
-    GestureUtilities.addGestureListenerTo(panel, pressureListener);
+      };
+      GestureUtilities.addGestureListenerTo(panel, pressureListener);
+    } catch (Throwable t) {
+      Logger.getInstance(MacGestureSupportForMouseShortcutPanel.class).warn("macOS gesture support failed", t);
+    }
   }
 }