Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
skiko
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuqiang
skiko
Commits
1d61852a
Commit
1d61852a
authored
Mar 19, 2021
by
Igor Demin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Linux. Fix crash in Compose on dialog open
https://github.com/JetBrains/compose-jb/issues/444
parent
bc43ce21
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
14 deletions
+21
-14
SkiaLayer.kt
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkiaLayer.kt
+21
-14
No files found.
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkiaLayer.kt
View file @
1d61852a
package
org.jetbrains.skiko
import
org.jetbrains.skija.Canvas
import
org.jetbrains.skija.ClipMode
import
org.jetbrains.skija.Picture
import
org.jetbrains.skija.PictureRecorder
import
org.jetbrains.skija.Rect
import
org.jetbrains.skija.*
import
org.jetbrains.skiko.context.ContextHandler
import
org.jetbrains.skiko.context.createContextHandler
import
org.jetbrains.skiko.redrawer.Redrawer
import
java.awt.event.InputMethodListener
import
java.awt.event.KeyListener
import
java.awt.event.MouseListener
import
java.awt.event.MouseMotionListener
import
java.awt.event.MouseWheelListener
import
java.awt.Graphics
import
java.awt.event.
HierarchyEvent
import
java.awt.event.
*
import
javax.swing.JPanel
import
javax.swing.SwingUtilities.invokeLater
import
javax.swing.SwingUtilities.isEventDispatchThread
interface
SkiaRenderer
{
...
...
@@ -45,6 +35,7 @@ open class SkiaLayer(
}
private
var
isInited
=
false
private
var
isRendering
=
false
private
fun
checkIsShowing
()
{
if
(!
isInited
&&
isShowing
)
{
...
...
@@ -115,7 +106,18 @@ open class SkiaLayer(
contentScaleChanged
()
}
redrawer
?.
syncSize
()
redrawer
?.
redrawImmediately
()
// `paint` can be called when we already inside `draw` method.
//
// For example if we call some AWT function inside renderer.onRender,
// such as `jframe.isEnabled = false` on Linux
//
// To avoid recursive call of `draw` (we don't support recursive calls) we just schedule redrawing.
if
(
isRendering
)
{
redrawer
?.
needRedraw
()
}
else
{
redrawer
?.
redrawImmediately
()
}
}
override
fun
addInputMethodListener
(
l
:
InputMethodListener
)
{
...
...
@@ -169,7 +171,12 @@ open class SkiaLayer(
canvas
.
clipRectBy
(
component
)
}
renderer
?.
onRender
(
canvas
,
pictureWidth
,
pictureHeight
,
nanoTime
)
try
{
isRendering
=
true
renderer
?.
onRender
(
canvas
,
pictureWidth
,
pictureHeight
,
nanoTime
)
}
finally
{
isRendering
=
false
}
// we can dispose layer during onRender
if
(!
isDisposed
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment