Unverified Commit cf54cc84 authored by Igor Demin's avatar Igor Demin Committed by GitHub

Remove NoInputSkikoView (#280)

parent 9383b5d9
...@@ -4,9 +4,9 @@ import org.jetbrains.skia.Canvas ...@@ -4,9 +4,9 @@ import org.jetbrains.skia.Canvas
interface SkikoView { interface SkikoView {
// Input // Input
fun onKeyboardEvent(event: SkikoKeyboardEvent) fun onKeyboardEvent(event: SkikoKeyboardEvent) = Unit
fun onPointerEvent(event: SkikoPointerEvent) fun onPointerEvent(event: SkikoPointerEvent) = Unit
fun onInputEvent(event: SkikoInputEvent) fun onInputEvent(event: SkikoInputEvent) = Unit
// Rendering // Rendering
fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long)
...@@ -37,15 +37,3 @@ open class GenericSkikoView( ...@@ -37,15 +37,3 @@ open class GenericSkikoView(
app.onPointerEvent(event) app.onPointerEvent(event)
} }
} }
abstract class NoInputSkikoView: SkikoView {
override fun onInputEvent(event: SkikoInputEvent) {
}
override fun onKeyboardEvent(event: SkikoKeyboardEvent) {
}
override fun onPointerEvent(event: SkikoPointerEvent) {
}
}
...@@ -71,7 +71,7 @@ native crash in SkiaWindowTest "render single window" ...@@ -71,7 +71,7 @@ native crash in SkiaWindowTest "render single window"
init { init {
setSize(width, height) setSize(width, height)
defaultCloseOperation = WindowConstants.DISPOSE_ON_CLOSE defaultCloseOperation = WindowConstants.DISPOSE_ON_CLOSE
layer.skikoView = object : NoInputSkikoView() { layer.skikoView = object : SkikoView {
override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) { override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
if (canCollect && frameTimes.size < frameCount) { if (canCollect && frameTimes.size < frameCount) {
frameTimes.add(System.nanoTime()) // we check the real time, not the time provided by the argument frameTimes.add(System.nanoTime()) // we check the real time, not the time provided by the argument
...@@ -181,7 +181,7 @@ j org.jetbrains.skiko.redrawer.MacOsRedrawer$drawLayer$1.draw()V+7 ...@@ -181,7 +181,7 @@ j org.jetbrains.skiko.redrawer.MacOsRedrawer$drawLayer$1.draw()V+7
val smoothFPSCounter = FPSCounter(count = frameCheckCount) val smoothFPSCounter = FPSCounter(count = frameCheckCount)
val onComplete = CompletableDeferred<Unit>() val onComplete = CompletableDeferred<Unit>()
fun renderer(window: SkiaWindow) = object : NoInputSkikoView() { fun renderer(window: SkiaWindow) = object : SkikoView {
var t1 = Long.MAX_VALUE var t1 = Long.MAX_VALUE
val refreshRate = window.graphicsConfiguration.device.displayMode.refreshRate val refreshRate = window.graphicsConfiguration.device.displayMode.refreshRate
......
...@@ -163,7 +163,7 @@ class SkiaWindowTest { ...@@ -163,7 +163,7 @@ class SkiaWindowTest {
window.setLocation(200, 200) window.setLocation(200, 200)
window.setSize(40, 20) window.setSize(40, 20)
window.defaultCloseOperation = WindowConstants.DISPOSE_ON_CLOSE window.defaultCloseOperation = WindowConstants.DISPOSE_ON_CLOSE
window.layer.skikoView = object : NoInputSkikoView() { window.layer.skikoView = object : SkikoView {
override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) { override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
renderCount++ renderCount++
} }
...@@ -262,7 +262,7 @@ class SkiaWindowTest { ...@@ -262,7 +262,7 @@ class SkiaWindowTest {
setSize(400, 200) setSize(400, 200)
preferredSize = Dimension(400, 200) preferredSize = Dimension(400, 200)
defaultCloseOperation = WindowConstants.DISPOSE_ON_CLOSE defaultCloseOperation = WindowConstants.DISPOSE_ON_CLOSE
layer.skikoView = object : NoInputSkikoView() { layer.skikoView = object : SkikoView {
override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) { override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
} }
} }
...@@ -424,7 +424,7 @@ class SkiaWindowTest { ...@@ -424,7 +424,7 @@ class SkiaWindowTest {
window.setLocation(200, 200) window.setLocation(200, 200)
window.setSize(400, 200) window.setSize(400, 200)
window.defaultCloseOperation = WindowConstants.DISPOSE_ON_CLOSE window.defaultCloseOperation = WindowConstants.DISPOSE_ON_CLOSE
window.layer.skikoView = object : NoInputSkikoView() { window.layer.skikoView = object : SkikoView {
override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) { override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
drawCount++ drawCount++
...@@ -470,7 +470,7 @@ class SkiaWindowTest { ...@@ -470,7 +470,7 @@ class SkiaWindowTest {
val paragraph by lazy { paragraph(window.layer.contentScale * 40, "=-+Нп") } val paragraph by lazy { paragraph(window.layer.contentScale * 40, "=-+Нп") }
window.layer.skikoView = object : NoInputSkikoView() { window.layer.skikoView = object : SkikoView {
override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) { override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
paragraph.layout(Float.POSITIVE_INFINITY) paragraph.layout(Float.POSITIVE_INFINITY)
paragraph.paint(canvas, 0f, 0f) paragraph.paint(canvas, 0f, 0f)
...@@ -502,7 +502,7 @@ class SkiaWindowTest { ...@@ -502,7 +502,7 @@ class SkiaWindowTest {
var rectWidth: Int, var rectWidth: Int,
var rectHeight: Int, var rectHeight: Int,
private val rectColor: Color private val rectColor: Color
) : NoInputSkikoView() { ) : SkikoView {
override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) { override fun onRender(canvas: Canvas, width: Int, height: Int, nanoTime: Long) {
val dpi = layer.contentScale val dpi = layer.contentScale
canvas.drawRect(Rect(0f, 0f, width.toFloat(), height.toFloat()), Paint().apply { canvas.drawRect(Rect(0f, 0f, width.toFloat(), height.toFloat()), Paint().apply {
...@@ -518,7 +518,7 @@ class SkiaWindowTest { ...@@ -518,7 +518,7 @@ class SkiaWindowTest {
private val layer: SkiaLayer, private val layer: SkiaLayer,
private val pixelsPerSecond: Double, private val pixelsPerSecond: Double,
private val size: Double private val size: Double
) : NoInputSkikoView() { ) : SkikoView {
private var oldNanoTime = Long.MAX_VALUE private var oldNanoTime = Long.MAX_VALUE
private var x = 0.0 private var x = 0.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment