chore: Workaround for #364 (choppy interactions with trackpad and OSR)

bric3 · Nov 10, 2024 · dcfe935 · dcfe935
1 parent eed46dd
commit dcfe935
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@
 ### Changed
 
 - Use the new `org.jetbrains.intellij.platform` v2.0.0 Gradle plugin to build the Excalidraw plugin
+- Don't use offscreen rendering (OSR) by default due to issues with trackpad (at least on macOs), see  
+   https://youtrack.jetbrains.com/issue/IJPL-156342/Scrolling-of-the-Whats-new-in-IntelliJ-IDEA-is-too-fast-faster-than-code-files
+
+  This is tunable in the advanced settings. 
+
 
 ## 0.4.0 - 2024-01-27
 

diff --git a/plugin/src/main/kotlin/com/github/bric3/excalidraw/editor/LoadableJCEFHtmlPanel.kt b/plugin/src/main/kotlin/com/github/bric3/excalidraw/editor/LoadableJCEFHtmlPanel.kt
@@ -6,6 +6,7 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.invokeLater
 import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.editor.EditorBundle
+import com.intellij.openapi.options.advanced.AdvancedSettings
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.ui.components.JBLoadingPanel
@@ -119,6 +120,6 @@ class LoadableJCEFHtmlPanel(
         private const val LOADING_KEY = 1
         private const val CONTENT_KEY = 0
         private val useOsr
-            get() = Registry.`is`("excalidraw.viewer.use.jcef.osr.view")
+            get() = AdvancedSettings.getBoolean("bric3.excalidraw.useOsr")
     }
 }
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
@@ -8,6 +8,8 @@
     <depends>com.intellij.modules.platform</depends>
     <depends>com.intellij.modules.json</depends>
 
+    <resource-bundle>messages.MyBundle</resource-bundle>
+
     <extensions defaultExtensionNs="com.intellij">
         <fileType name="Excalidraw sketch"
                   implementationClass="com.github.bric3.excalidraw.files.ExcalidrawFileType"
@@ -36,10 +38,16 @@
         <scratch.creationHelper language="Excalidraw"
                                 implementationClass="com.github.bric3.excalidraw.scratch.ExcalidrawScratchFileCreationHelper"/>
 
-        <registryKey defaultValue="true" key="excalidraw.viewer.use.jcef.osr.view" description="Enables JCEF off-screen rendering for Excalidraw"/>
-
-        <!-- Marketplace exception initializer : https://plugins.jetbrains.com/docs/marketplace/exception-analyzer.html -->
+        <!-- Marketplace exception initializer: https://plugins.jetbrains.com/docs/marketplace/exception-analyzer.html -->
         <errorHandler implementation="com.intellij.diagnostic.JetBrainsMarketplaceErrorReportSubmitter"/>
+
+        <!--
+        Disable OSR by default due to trackpad issues on macOS (at least), see
+        https://youtrack.jetbrains.com/issue/IJPL-156342/Scrolling-of-the-Whats-new-in-IntelliJ-IDEA-is-too-fast-faster-than-code-files
+        -->
+        <advancedSetting default="false"
+                         id="bric3.excalidraw.useOsr"
+                         groupKey="bric3.excalidraw.advanced.settings" />
     </extensions>
 
     <actions>

diff --git a/plugin/src/main/resources/messages/MyBundle.properties b/plugin/src/main/resources/messages/MyBundle.properties
@@ -1,4 +1,8 @@
 name=Excalidraw Integration
 applicationService=Application service
 projectService=Project service: {0}
-title.excalidraw.usage.error=Usage error
+title.excalidraw.usage.error=Usage error
+
+## Advanced settings
+bric3.excalidraw.advanced.settings=Excalidraw
+advanced.setting.bric3.excalidraw.useOsr=JCEF off-screen rendering for Excalidraw.