Merge pull request #238 from valb3r/feature/FBP-237-deprecation-high-…

…dpi-util Feature/fbp 237 deprecation high dpi util
valb3r · Jul 31, 2021 · 553d1e1 · 553d1e1
2 parents 03e8fc9 + 2664dd1
commit 553d1e1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/...in/com/valb3r/bpmn/intellij/plugin/commons/actions/DefaultAttachBpmnDebuggerToDbAction.kt b/...in/com/valb3r/bpmn/intellij/plugin/commons/actions/DefaultAttachBpmnDebuggerToDbAction.kt
@@ -74,7 +74,7 @@ abstract class IntelliJBpmnDebugger(private val schema: DbElement): BpmnDebugger
  private fun fetchFromDb(project: Project, processId: String): ExecutedElements? {
  try {
  val connProvider = DbImplUtil.getDatabaseConnection(schema, DGDepartment.INTROSPECTION)?.get()
- // Old IntelliJ provides only getJdbcConnection
+ // TODO !COMPATIBILITY: Old IntelliJ provides only getJdbcConnection
  try {
  val jdbcSupplier = connProvider?.javaClass?.getMethod("getJdbcConnection")
  if (true != jdbcSupplier?.isAccessible) {

diff --git a/...lugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/CanvasConstants.kt b/...lugin-core/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/core/render/CanvasConstants.kt
@@ -1,6 +1,5 @@
 package com.valb3r.bpmn.intellij.plugin.core.render
 
-import com.intellij.util.ui.UIUtil
 import java.awt.geom.Point2D
 
 interface CanvasConstants {
@@ -12,9 +11,20 @@ interface CanvasConstants {
 }
 
 data class DefaultCanvasConstants(
-  override val epsilon: Float = 0.1f,
-  override val anchorAttractionThreshold: Float = 5.0f,
-  override val baseCursorSize: Float = if (UIUtil.isJreHiDPIEnabled()) 20.0f else 10.0f,
-  override val defaultCameraOrigin: Point2D.Float = Point2D.Float(0f, 0f),
-  override val defaultZoomRatio: Float = 1f
+ override val epsilon: Float = 0.1f,
+ override val anchorAttractionThreshold: Float = 5.0f,
+ override val baseCursorSize: Float = if (isJreHiDPIEnabled()) 20.0f else 10.0f,
+ override val defaultCameraOrigin: Point2D.Float = Point2D.Float(0f, 0f),
+ override val defaultZoomRatio: Float = 1f
 ): CanvasConstants
+
+fun isJreHiDPIEnabled(): Boolean {
+ return try {
+ val jreHighDpiUtil = Class.forName("com.intellij.ui.JreHiDpiUtil")
+ jreHighDpiUtil.getMethod("isJreHiDPIEnabled").invoke(null) as Boolean
+ } catch (ex: Exception) {
+ // TODO !COMPATIBILITY: com.intellij.util.ui.UIUtil.isJreHiDPIEnabled is scheduled for removal in 2021.3, keeping it as fallback for 2018.1
+ val uiUtil = Class.forName("com.intellij.util.ui.UIUtil")
+ uiUtil.getMethod("isJreHiDPIEnabled").invoke(null) as Boolean
+ }
+}