Merge remote-tracking branch 'upstream/master'

Author: silenium-dev

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Create
+    url: https://youtrack.jetbrains.com/newIssue?project=SKIKO
+    about: Please report new issues to the JetBrains YouTrack

.github/workflows/ci.yml

@@ -120,7 +120,7 @@ jobs:
           ./gradlew --stacktrace --info -Pskiko.native.enabled=true -Pskiko.test.onci=true :skiko:tvosX64Test
           # tvosSimulatorArm64Test will build the binary but the tests will be skipped due to X64 host machine
           ./gradlew --stacktrace --info -Pskiko.native.enabled=true -Pskiko.test.onci=true :skiko:tvosSimulatorArm64Test
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: test-reports-macos

skiko/gradle.properties

@@ -2,7 +2,7 @@ kotlin.code.style=official
 deploy.version=0.0.0
 
 
-dependencies.skia=m126-1d69d9b-2
+dependencies.skia=m126-d2aaacc35d-4
 
 # you can override general skia dependencies by passing platform-specific property: 
 # dependencies.skia.android-arm64

skiko/src/awtMain/kotlin/org/jetbrains/skiko/SkiaLayer.awt.kt

@@ -18,6 +18,10 @@ import javax.swing.JPanel
 import javax.swing.SwingUtilities
 import javax.swing.SwingUtilities.isEventDispatchThread
 import javax.swing.UIManager
+import javax.swing.event.AncestorEvent
+import javax.swing.event.AncestorListener
+import kotlin.math.ceil
+import kotlin.math.floor
 
 actual open class SkiaLayer internal constructor(
     externalAccessibleFactory: ((Component) -> Accessible)? = null,
@@ -133,6 +137,16 @@ actual open class SkiaLayer internal constructor(
         @Suppress("LeakingThis")
         add(backedLayer)
 
+        addAncestorListener(object : AncestorListener {
+            override fun ancestorAdded(event: AncestorEvent?) = Unit
+
+            override fun ancestorRemoved(event: AncestorEvent?) = Unit
+
+            override fun ancestorMoved(event: AncestorEvent?) {
+                revalidate()
+            }
+        })
+
         backedLayer.addHierarchyListener {
             if (it.changeFlags and HierarchyEvent.SHOWING_CHANGED.toLong() != 0L) {
                 checkShowing()
@@ -143,7 +157,7 @@ actual open class SkiaLayer internal constructor(
         addPropertyChangeListener("graphicsContextScaleTransform") {
             Logger.debug { "graphicsContextScaleTransform changed for $this" }
             latestReceivedGraphicsContextScaleTransform = it.newValue as AffineTransform
-            redrawer?.syncSize()
+            revalidate()
             notifyChange(PropertyKind.ContentScale)
 
             // Workaround for JBR-5259
@@ -191,7 +205,7 @@ actual open class SkiaLayer internal constructor(
             redrawer?.setVisible(isShowing)
         }
         if (isShowing) {
-            redrawer?.syncSize()
+            redrawer?.syncBounds()
             repaint()
         }
     }
@@ -252,7 +266,7 @@ actual open class SkiaLayer internal constructor(
     private val redrawerManager = RedrawerManager<Redrawer>(properties.renderApi) { renderApi, oldRedrawer ->
         oldRedrawer?.dispose()
         val newRedrawer = renderFactory.createRedrawer(this, renderApi, analytics, properties)
-        newRedrawer.syncSize()
+        newRedrawer.syncBounds()
         newRedrawer
     }
 
@@ -316,12 +330,16 @@ actual open class SkiaLayer internal constructor(
 
     override fun doLayout() {
         Logger.debug { "doLayout on $this" }
-        backedLayer.setBounds(0, 0, roundSize(width), roundSize(height))
+        backedLayer.setBounds(
+            0,
+            0,
+            adjustSizeToContentScale(contentScale, width),
+            adjustSizeToContentScale(contentScale, height)
+        )
         backedLayer.validate()
-        redrawer?.syncSize()
+        redrawer?.syncBounds()
     }
 
-
     override fun paint(g: java.awt.Graphics) {
         Logger.debug { "Paint called on: $this" }
         checkContentScale()
@@ -338,7 +356,7 @@ actual open class SkiaLayer internal constructor(
         // Please note that calling redraw during layout might break software renderers,
         // so applying this fix only for Direct3D case.
         if (renderApi == GraphicsApi.DIRECT3D && isShowing) {
-            redrawer?.syncSize()
+            redrawer?.syncBounds()
             tryRedrawImmediately()
         }
     }
@@ -579,18 +597,6 @@ actual open class SkiaLayer internal constructor(
         }
     }
 
-    private fun roundSize(value: Int): Int {
-        var rounded = value * contentScale
-        val diff = rounded - rounded.toInt()
-        // We check values close to 0.5 and edit the size to avoid white lines glitch
-        if (diff > 0.4f && diff < 0.6f) {
-            rounded = value + 1f
-        } else {
-            rounded = value.toFloat()
-        }
-        return rounded.toInt()
-    }
-
     fun requestNativeFocusOnAccessible(accessible: Accessible?) {
         backedLayer.requestNativeFocusOnAccessible(accessible)
     }
@@ -637,3 +643,28 @@ internal fun Canvas.clipRectBy(rectangle: ClipRectangle, scale: Float) {
         true
     )
 }
+
+// TODO Recheck this method validity in 2 cases - full Window content, and a Panel content
+//  issue: https://youtrack.jetbrains.com/issue/CMP-5447/Window-white-line-on-the-bottom-before-resizing
+//  suggestions: https://github.com/JetBrains/skiko/pull/988#discussion_r1763219300
+//  possible issues:
+//  - isn't obvious why 0.4/0.6 is used
+//  - increasing it by one, we avoid 1px white line, but we cut the content by 1px
+//  - it probably doesn't work correctly in a Panel content case - we don't need to adjust in this case
+/**
+ * Increases the value of width/height by one if necessary,
+ * to avoid 1px white line between Canvas and the bounding window.
+ * 1px white line appears when users resizes the window:
+ * - it is resized in Px (125, 126, 127,...)
+ * - the canvas is resized in Points (with 1.25 scale, it will be 100, 100, 101)
+ * during converting Int AWT points to actual screen pixels.
+ */
+private fun adjustSizeToContentScale(contentScale: Float, value: Int): Int {
+    val scaled = value * contentScale
+    val diff = scaled - floor(scaled)
+    return if (diff > 0.4f && diff < 0.6f) {
+        value + 1
+    } else {
+        value
+    }
+}

skiko/src/awtMain/kotlin/org/jetbrains/skiko/redrawer/MetalRedrawer.kt

@@ -169,7 +169,7 @@ internal class MetalRedrawer(
         }
     }
 
-    override fun syncSize() = synchronized(drawLock) {
+    override fun syncBounds() = synchronized(drawLock) {
         check(isEventDispatchThread()) { "Method should be called from AWT event dispatch thread" }
         val rootPane = getRootPane(layer)
         val globalPosition = convertPoint(layer.backedLayer, 0, 0, rootPane)

skiko/src/awtTest/kotlin/org/jetbrains/skiko/SkiaLayerTest.kt

@@ -28,6 +28,7 @@ import java.awt.BorderLayout
 import java.awt.Color
 import java.awt.Dimension
 import java.awt.event.*
+import javax.swing.Box
 import javax.swing.JFrame
 import javax.swing.JLayeredPane
 import javax.swing.JPanel
@@ -261,6 +262,48 @@ class SkiaLayerTest {
         }
     }
 
+    @Test
+    fun `move without redrawing`() = uiTest {
+        val window = JFrame()
+        val layer = SkiaLayer(
+            properties = SkiaLayerProperties(renderApi = renderApi)
+        )
+
+        layer.renderDelegate = object : SkikoRenderDelegate {
+            override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
+                canvas.drawRect(Rect(0f, 0f, width.toFloat(), height.toFloat()), Paint().apply {
+                    color = Color.RED.rgb
+                })
+            }
+        }
+        layer.size = Dimension(100, 100)
+        val box = Box.createVerticalBox().apply {
+            add(layer)
+        }
+        box.setBounds(0, 0, 100, 100)
+
+        try {
+            val panel = JLayeredPane()
+            panel.add(box)
+            window.contentPane.add(panel)
+            window.setLocation(200, 200)
+            window.size = Dimension(200, 200)
+            window.defaultCloseOperation = WindowConstants.DISPOSE_ON_CLOSE
+            window.isUndecorated = true
+            window.isVisible = true
+
+            delay(1000)
+            screenshots.assert(window.bounds, "frame1")
+
+            box.setBounds(100, 0, 100, 100)
+            delay(1000)
+            screenshots.assert(window.bounds, "frame2")
+        } finally {
+            layer.dispose()
+            window.close()
+        }
+    }
+
     @Test
     fun `resize window`() = uiTest {
         val window = UiTestWindow()
@@ -698,6 +741,8 @@ class SkiaLayerTest {
         // SOFTWARE_COMPAT fails because it's just too slow
         excludeRenderApis = listOf(GraphicsApi.SOFTWARE_COMPAT)
     ) {
+        assumeTrue(hostOs == OS.MacOS) // since the test has 'metal' in its name (it is flaky on Windows)
+
         val renderTimes = mutableListOf<Long>()
         val renderer = object: SkikoRenderDelegate {
             override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {

skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/StrutStyle.kt

@@ -211,6 +211,7 @@ class StrutStyle internal constructor(ptr: NativePointer) : Managed(ptr, _Finali
         return this
     }
 
+    @Deprecated("Replaced by topRatio")
     var isHalfLeading: Boolean
         get() = try {
             Stats.onNativeCall()
@@ -222,6 +223,8 @@ class StrutStyle internal constructor(ptr: NativePointer) : Managed(ptr, _Finali
             setHalfLeading(value)
         }
 
+    // Same as topRatio = halfLeading ? 0.5f : -1.0f
+    @Deprecated("Replaced by topRatio")
     fun setHalfLeading(value: Boolean): StrutStyle {
         try {
             Stats.onNativeCall()
@@ -232,6 +235,29 @@ class StrutStyle internal constructor(ptr: NativePointer) : Managed(ptr, _Finali
         return this
     }
 
+    // [0..1]: the ratio of ascent to ascent+descent
+    // -1: proportional to the ascent/descent
+    var topRatio: Float
+        get() = try {
+            Stats.onNativeCall()
+            StrutStyle_nGetTopRatio(_ptr)
+        } finally {
+            reachabilityBarrier(this)
+        }
+        set(value) {
+            setTopRatio(value)
+        }
+
+    fun setTopRatio(topRatio: Float): StrutStyle {
+        try {
+            Stats.onNativeCall()
+            StrutStyle_nSetTopRatio(_ptr, topRatio)
+        } finally {
+            reachabilityBarrier(this)
+        }
+        return this
+    }
+
     private object _FinalizerHolder {
         val PTR = StrutStyle_nGetFinalizer()
     }
@@ -321,3 +347,11 @@ private external fun _nIsHalfLeading(ptr: NativePointer): Boolean
 @ExternalSymbolName("org_jetbrains_skia_paragraph_StrutStyle__1nSetHalfLeading")
 @ModuleImport("./skiko.mjs", "org_jetbrains_skia_paragraph_StrutStyle__1nSetHalfLeading")
 private external fun _nSetHalfLeading(ptr: NativePointer, value: Boolean)
+
+@ExternalSymbolName("org_jetbrains_skia_paragraph_StrutStyle__1nGetTopRatio")
+@ModuleImport("./skiko.mjs", "org_jetbrains_skia_paragraph_StrutStyle__1nGetTopRatio")
+private external fun StrutStyle_nGetTopRatio(ptr: NativePointer): Float
+
+@ExternalSymbolName("org_jetbrains_skia_paragraph_StrutStyle__1nSetTopRatio")
+@ModuleImport("./skiko.mjs", "org_jetbrains_skia_paragraph_StrutStyle__1nSetTopRatio")
+private external fun StrutStyle_nSetTopRatio(ptr: NativePointer, value: Float)

skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/TextStyle.kt

@@ -323,6 +323,7 @@ class TextStyle internal constructor(ptr: NativePointer) : Managed(ptr, _Finaliz
         return this
     }
 
+    @Deprecated("Replaced by topRatio")
     var isHalfLeading: Boolean
         get() = try {
             Stats.onNativeCall()
@@ -334,6 +335,8 @@ class TextStyle internal constructor(ptr: NativePointer) : Managed(ptr, _Finaliz
             setHalfLeading(value)
         }
 
+    // Same as topRatio = halfLeading ? 0.5f : -1.0f
+    @Deprecated("Replaced by topRatio")
     fun setHalfLeading(value: Boolean): TextStyle {
         try {
             Stats.onNativeCall()
@@ -344,6 +347,29 @@ class TextStyle internal constructor(ptr: NativePointer) : Managed(ptr, _Finaliz
         return this
     }
 
+    // [0..1]: the ratio of ascent to ascent+descent
+    // -1: proportional to the ascent/descent
+    var topRatio: Float
+        get() = try {
+            Stats.onNativeCall()
+            TextStyle_nGetTopRatio(_ptr)
+        } finally {
+            reachabilityBarrier(this)
+        }
+        set(value) {
+            setTopRatio(value)
+        }
+
+    fun setTopRatio(topRatio: Float): TextStyle {
+        try {
+            Stats.onNativeCall()
+            TextStyle_nSetTopRatio(_ptr, topRatio)
+        } finally {
+            reachabilityBarrier(this)
+        }
+        return this
+    }
+
     var letterSpacing: Float
         get() = try {
             Stats.onNativeCall()
@@ -560,6 +586,14 @@ private external fun TextStyle_nGetHalfLeading(ptr: NativePointer): Boolean
 @ModuleImport("./skiko.mjs", "org_jetbrains_skia_paragraph_TextStyle__1nSetHalfLeading")
 private external fun TextStyle_nSetHalfLeading(ptr: NativePointer, value: Boolean)
 
+@ExternalSymbolName("org_jetbrains_skia_paragraph_TextStyle__1nGetTopRatio")
+@ModuleImport("./skiko.mjs", "org_jetbrains_skia_paragraph_TextStyle__1nGetTopRatio")
+private external fun TextStyle_nGetTopRatio(ptr: NativePointer): Float
+
+@ExternalSymbolName("org_jetbrains_skia_paragraph_TextStyle__1nSetTopRatio")
+@ModuleImport("./skiko.mjs", "org_jetbrains_skia_paragraph_TextStyle__1nSetTopRatio")
+private external fun TextStyle_nSetTopRatio(ptr: NativePointer, value: Float)
+
 @ExternalSymbolName("org_jetbrains_skia_paragraph_TextStyle__1nGetBaselineShift")
 @ModuleImport("./skiko.mjs", "org_jetbrains_skia_paragraph_TextStyle__1nGetBaselineShift")
 private external fun TextStyle_nGetBaselineShift(ptr: NativePointer): Float

skiko/src/commonMain/kotlin/org/jetbrains/skiko/redrawer/Redrawer.kt

@@ -4,7 +4,7 @@ internal interface Redrawer {
     fun dispose()
     fun needRedraw()
     fun redrawImmediately()
-    fun syncSize() = Unit
+    fun syncBounds() = Unit
     fun setVisible(isVisible: Boolean) = Unit
     val renderInfo: String
 }

skiko/src/commonTest/kotlin/org/jetbrains/skiko/paragraph/TextStyleTest.kt

@@ -143,6 +143,15 @@ class TextStyleTest {
         }
     }
 
+    @Test
+    fun textStyleTopRatioTest() {
+        TextStyle().use { textStyle ->
+            assertEquals(-1f, textStyle.topRatio)
+            textStyle.topRatio = 0.42f
+            assertEquals(0.42f, textStyle.topRatio, 0.001f)
+        }
+    }
+
     @Test
     fun textStyleMetricsContainsMeaningfulValues() = runTest {
         val jbMono = Typeface.makeFromResource(jbMonoPath)