Skip to content

make native logger and wry-panel logger bridged #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kdroidFilter merged 2 commits into from
Jan 17, 2026
Merged

make native logger and wry-panel logger bridged #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8254054
make native logger and wry logger bridged
magic-cucumber Jan 16, 2026
a85dfcc
make native logger and wry logger bridged
magic-cucumber Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions wrywebview/src/main/kotlin/io/github/kdroidfilter/webview/wry/WryWebViewPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@ import javax.swing.JPanel
import javax.swing.SwingUtilities
import javax.swing.Timer
import kotlin.concurrent.thread
import kotlin.properties.Delegates


class WryWebViewPanel(
initialUrl: String,
customUserAgent: String? = null,
private val bridgeLogger: (String) -> Unit = { System.err.println(it) }
) : JPanel() {
private val host = SkikoInterop.createHost()
private var webviewId: ULong? = null
Expand Down Expand Up @@ -568,7 +570,7 @@ class WryWebViewPanel(

private fun log(message: String) {
if (LOG_ENABLED) {
System.err.println("[WryWebViewPanel] $message")
bridgeLogger("[WryWebViewPanel] $message")
}
}

Expand Down Expand Up @@ -665,12 +667,12 @@ class WryWebViewPanel(
private data class ParentHandle(val handle: ULong, val isWindow: Boolean)
private data class Bounds(val x: Int, val y: Int, val width: Int, val height: Int)

private companion object {
companion object {
private val OS_NAME = System.getProperty("os.name")?.lowercase().orEmpty()
private val IS_LINUX = OS_NAME.contains("linux")
private val IS_MAC = OS_NAME.contains("mac")
private val IS_WINDOWS = OS_NAME.contains("windows")
private val LOG_ENABLED = run {
var LOG_ENABLED = run {
val raw = System.getProperty("composewebview.wry.log") ?: System.getenv("WRYWEBVIEW_LOG")
when {
raw == null -> false
Expand All @@ -681,19 +683,24 @@ class WryWebViewPanel(
else -> false
}
}

var NATIVE_LOGGER: (String) -> Unit = { System.err.println(it) }

init {
setNativeLogger(
object : NativeLogger {
override fun handleLog(data: String) {
if (LOG_ENABLED) {
NATIVE_LOGGER(data)
}
}
}
)
}
}
}

private object NativeBindings {
init {
setNativeLogger(
object : NativeLogger {
override fun handleLog(data: String) {
println(data)
}
}
)
}

fun createWebview(parentHandle: ULong, width: Int, height: Int, url: String, handler: NavigationHandler): ULong {
return io.github.kdroidfilter.webview.wry.createWebview(parentHandle, width, height, url, handler)
Expand Down