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
beeb6e52
Unverified
Commit
beeb6e52
authored
Apr 21, 2021
by
Nikolay Igotti
Committed by
GitHub
Apr 21, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix IM handling. (#94)
parent
bed10c51
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
HardwareLayer.kt
...o/src/jvmMain/kotlin/org/jetbrains/skiko/HardwareLayer.kt
+5
-0
SkiaLayer.kt
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkiaLayer.kt
+11
-7
No files found.
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/HardwareLayer.kt
View file @
beeb6e52
...
@@ -2,6 +2,7 @@ package org.jetbrains.skiko
...
@@ -2,6 +2,7 @@ package org.jetbrains.skiko
import
java.awt.Canvas
import
java.awt.Canvas
import
java.awt.Graphics
import
java.awt.Graphics
import
java.awt.event.InputMethodEvent
internal
open
class
HardwareLayer
:
Canvas
()
{
internal
open
class
HardwareLayer
:
Canvas
()
{
companion
object
{
companion
object
{
...
@@ -27,6 +28,10 @@ internal open class HardwareLayer : Canvas() {
...
@@ -27,6 +28,10 @@ internal open class HardwareLayer : Canvas() {
nativeDispose
()
nativeDispose
()
}
}
fun
doProcessInputMethodEvent
(
e
:
InputMethodEvent
?)
{
processInputMethodEvent
(
e
)
}
private
external
fun
nativeInit
(
platformInfo
:
Long
)
private
external
fun
nativeInit
(
platformInfo
:
Long
)
private
external
fun
nativeDispose
()
private
external
fun
nativeDispose
()
...
...
skiko/src/jvmMain/kotlin/org/jetbrains/skiko/SkiaLayer.kt
View file @
beeb6e52
...
@@ -9,13 +9,7 @@ import org.jetbrains.skiko.context.ContextHandler
...
@@ -9,13 +9,7 @@ import org.jetbrains.skiko.context.ContextHandler
import
org.jetbrains.skiko.context.createContextHandler
import
org.jetbrains.skiko.context.createContextHandler
import
org.jetbrains.skiko.redrawer.Redrawer
import
org.jetbrains.skiko.redrawer.Redrawer
import
java.awt.Graphics
import
java.awt.Graphics
import
java.awt.event.FocusEvent
import
java.awt.event.*
import
java.awt.event.HierarchyEvent
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.im.InputMethodRequests
import
java.awt.im.InputMethodRequests
import
javax.swing.JPanel
import
javax.swing.JPanel
import
javax.swing.SwingUtilities.isEventDispatchThread
import
javax.swing.SwingUtilities.isEventDispatchThread
...
@@ -163,6 +157,14 @@ open class SkiaLayer(
...
@@ -163,6 +157,14 @@ open class SkiaLayer(
backedLayer
.
enableInputMethods
(
enable
)
backedLayer
.
enableInputMethods
(
enable
)
}
}
override
fun
getInputMethodListeners
():
Array
<
InputMethodListener
>
{
return
backedLayer
.
getInputMethodListeners
()
}
override
fun
processInputMethodEvent
(
e
:
InputMethodEvent
?)
{
backedLayer
.
doProcessInputMethodEvent
(
e
)
}
override
fun
requestFocus
()
{
override
fun
requestFocus
()
{
backedLayer
.
requestFocus
()
backedLayer
.
requestFocus
()
}
}
...
@@ -172,6 +174,7 @@ open class SkiaLayer(
...
@@ -172,6 +174,7 @@ open class SkiaLayer(
}
}
override
fun
addInputMethodListener
(
l
:
InputMethodListener
)
{
override
fun
addInputMethodListener
(
l
:
InputMethodListener
)
{
super
.
addInputMethodListener
(
l
)
backedLayer
.
addInputMethodListener
(
l
)
backedLayer
.
addInputMethodListener
(
l
)
}
}
...
@@ -192,6 +195,7 @@ open class SkiaLayer(
...
@@ -192,6 +195,7 @@ open class SkiaLayer(
}
}
override
fun
removeInputMethodListener
(
l
:
InputMethodListener
)
{
override
fun
removeInputMethodListener
(
l
:
InputMethodListener
)
{
super
.
removeInputMethodListener
(
l
)
backedLayer
.
removeInputMethodListener
(
l
)
backedLayer
.
removeInputMethodListener
(
l
)
}
}
...
...
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