Fix bounds of ComposePanel in IntelliJ on macOs

.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

.github/workflows/web.yml

@@ -60,7 +60,7 @@ jobs:
  cd ./skiko
  source ./emsdk/emsdk_env.sh
  ./gradlew --stacktrace --info -Pskiko.wasm.enabled=true -Pskiko.js.enabled=true -Pskiko.test.onci=true jsTest
- - uses: actions/upload-artifact@v2
+ - uses: actions/upload-artifact@v4
  if: always()
  with:
  name: test-reports-wasm

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

@@ -18,6 +18,8 @@ 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
 
 actual open class SkiaLayer internal constructor(
  externalAccessibleFactory: ((Component) -> Accessible)? = null,
@@ -133,6 +135,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 +155,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 +203,7 @@ actual open class SkiaLayer internal constructor(
  redrawer?.setVisible(isShowing)
  }
  if (isShowing) {
- redrawer?.syncSize()
+ redrawer?.syncBounds()
  repaint()
  }
  }
@@ -252,7 +264,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 +328,11 @@ 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(width), adjustSizeToContentScale(height))
  backedLayer.validate()
- redrawer?.syncSize()
+ redrawer?.syncBounds()
  }
 
-
  override fun paint(g: java.awt.Graphics) {
  Logger.debug { "Paint called on: $this" }
  checkContentScale()
@@ -338,7 +349,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,16 +590,15 @@ actual open class SkiaLayer internal constructor(
  }
  }
 
- private fun roundSize(value: Int): Int {
- var rounded = value * contentScale
- val diff = rounded - rounded.toInt()
+ private fun adjustSizeToContentScale(value: Int): Int {
+ val scaled = value * contentScale
+ val diff = scaled - scaled.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
+ return if (diff > 0.4f && diff < 0.6f) {
+ (value + 1f).toInt()
  } else {
- rounded = value.toFloat()
+ value.toFloat().toInt()
  }
- return rounded.toInt()
  }
 
  fun requestNativeFocusOnAccessible(accessible: Accessible?) {

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()

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/macosMain/kotlin/org/jetbrains/skiko/SkiaLayer.macos.kt

@@ -84,13 +84,13 @@ actual open class SkiaLayer {
  private val nsViewObserver = object : NSObject() {
  @ObjCAction
  fun frameDidChange(notification: NSNotification) {
- redrawer?.syncSize()
+ redrawer?.syncBounds()
  redrawer?.redrawImmediately()
  }
 
  @ObjCAction
  fun windowDidChangeBackingProperties(notification: NSNotification) {
- redrawer?.syncSize()
+ redrawer?.syncBounds()
  redrawer?.redrawImmediately()
  }
 
@@ -126,7 +126,7 @@ actual open class SkiaLayer {
  nsView.postsFrameChangedNotifications = true
  nsViewObserver.addObserver()
  redrawer = createNativeRedrawer(this, renderApi).apply {
- syncSize()
+ syncBounds()
  needRedraw()
  }
  }

skiko/src/macosMain/kotlin/org/jetbrains/skiko/redrawer/MetalRedrawer.macos.kt

@@ -79,7 +79,7 @@ internal class MacOsMetalRedrawer(
  /**
  * Synchronizes the [metalLayer] size with the size of underlying nsView
  */
- override fun syncSize() {
+ override fun syncBounds() {
  syncContentScale()
  val osFrame = skiaLayer.nsView.frame
  val (w, h) = osFrame.useContents {

skiko/src/macosMain/kotlin/org/jetbrains/skiko/redrawer/OpenGLRedrawer.macos.kt

@@ -43,7 +43,7 @@ internal class MacOsOpenGLRedrawer(
  glLayer.dispose()
  }
 
- override fun syncSize() {
+ override fun syncBounds() {
  syncContentScale()
  skiaLayer.nsView.frame.useContents {
  glLayer.setFrame(