Merge pull request #353 from DrUlysses/main

onLoadEnd duplicate fix for #352

Author: KevinnZou

webview/src/desktopMain/kotlin/com/multiplatform/webview/web/WebEngineExt.kt

@@ -129,7 +129,7 @@ internal fun CefBrowser.addLoadListener(
                 KLogger.d { "Load End ${browser?.url}" }
                 state.loadingState = LoadingState.Finished
                 navigator.canGoBack = canGoBack()
-                navigator.canGoBack = canGoForward()
+                navigator.canGoForward = canGoForward()
                 state.lastLoadedUrl = getCurrentUrl()
             }
 

webview/src/desktopMain/kotlin/com/multiplatform/webview/web/WebView.desktop.kt

@@ -1,12 +1,6 @@
 package com.multiplatform.webview.web
 
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.awt.SwingPanel
 import com.multiplatform.webview.jsbridge.WebViewJsBridge
@@ -15,6 +9,7 @@ import dev.datlag.kcef.KCEFBrowser
 import dev.datlag.kcef.KCEFClient
 import org.cef.browser.CefRendering
 import org.cef.browser.CefRequestContext
+import java.util.concurrent.TimeUnit
 
 /**
  * Desktop WebView implementation.
@@ -142,18 +137,28 @@ fun DesktopWebView(
     }
 
     browser?.let {
-        SwingPanel(
-            factory = {
-                onCreated(it)
-                browser.apply {
-                    addDisplayHandler(state)
-                    addLoadListener(state, navigator)
-                    addRequestHandler(state, navigator)
-                }
-                browser.uiComponent
-            },
-            modifier = modifier,
-        )
+        if (runCatching { browser.windowlessFrameRate.get(100L, TimeUnit.MILLISECONDS) }.getOrNull() == null) {
+            SwingPanel(
+                factory = {
+                    onCreated(browser)
+                    browser.apply {
+                        addDisplayHandler(state)
+                        addLoadListener(state, navigator)
+                        addRequestHandler(state, navigator)
+                    }
+                    browser.uiComponent
+                },
+                modifier = modifier,
+            )
+        } else {
+            onCreated(browser)
+            browser.apply {
+                addDisplayHandler(state)
+                addLoadListener(state, navigator)
+                addRequestHandler(state, navigator)
+            }
+            browser.uiComponent.size = java.awt.Dimension(1280, 720)
+        }
     }
 
     DisposableEffect(Unit) {