add entryType property to Webview

bung87 · Aug 16, 2024 · 9a68ead · 9a68ead
1 parent 2c8f29f
commit 9a68ead
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/src/crowngui.nim b/src/crowngui.nim
@@ -1,13 +1,10 @@
 
-import os, strutils, crowngui / [webview, net_utils]
+import os, strutils, crowngui / [webview, net_utils, types]
 import static_server, mimetypes, asyncdispatch
 import finder
-
 export webview
 
 type
-  EntryType = enum
-    url, file, html, dir
   Application* = object
     entry: string
     entryType: EntryType
@@ -50,7 +47,7 @@ proc newApplication*(entry: static[string]): ApplicationRef =
       const url = entry
       EntryType.file
     else:
-      const url = dataUriHtmlHeader entry.strip
+      const url =  entry.strip
       EntryType.html
   when defined(bundle):
     const data = staticRead bundle
@@ -60,7 +57,7 @@ proc newApplication*(entry: static[string]): ApplicationRef =
   when defined(bundle):
     port = findAvailablePort()
     let url = "http://localhost:" & $port
-  result.webview = newWebView(url)
+  result.webview = newWebView(url, entryType)
   when defined(bundle):
     result.webview.url = url
 

diff --git a/src/crowngui/platforms/win/webview2/types.nim b/src/crowngui/platforms/win/webview2/types.nim
@@ -1,6 +1,7 @@
 import winim
 import com
 # import std/[atomics]
+import ../../../types
 
 type
   WebView* = ptr WebViewObj
@@ -16,6 +17,7 @@ type
     priv*: WebviewPrivObj
     created*: bool
     onOpenFile*: OnOpenFile
+    entryType*: EntryType
   WebviewPrivObj* = object
     windowHandle*: HWND
     view*: ptr ICoreWebView2

diff --git a/src/crowngui/types.nim b/src/crowngui/types.nim
@@ -0,0 +1,3 @@
+type
+  EntryType* = enum
+    url, file, html, dir
diff --git a/src/crowngui/webview.nim b/src/crowngui/webview.nim
@@ -1,6 +1,6 @@
 include js_utils
 import tables, strutils, macros, logging, json, os, base64, strformat, std/exitprocs
-
+import ./types
 var logger = newRollingFileLogger(expandTilde("~/crowngui.log"))
 addHandler(logger)
 
@@ -182,7 +182,7 @@ proc run*(w: Webview; quitProc: proc () {.noconv.}; controlCProc: proc () {.noco
   system.setControlCHook(controlCProc)
   w.run
 
-proc webView(title = ""; url = ""; width: Positive = 1000; height: Positive = 700; resizable: static[bool] = true;
+proc webView(title = ""; url = "";entryType:static[EntryType]; width: Positive = 1000; height: Positive = 700; resizable: static[bool] = true;
     debug: static[bool] = not defined(release); callback: ExternalInvokeCb = nil): Webview {.inline.} =
   result = create(WebviewObj)
   result.title = title
@@ -191,11 +191,12 @@ proc webView(title = ""; url = ""; width: Positive = 1000; height: Positive = 70
   result.height = height
   result.resizable = resizable
   result.debug = debug
+  result.entryType = entryType
   result.invokeCb = generalExternalInvokeCallback
   if callback != nil: result.externalInvokeCB = callback
   if result.webview_init() != 0: return nil
 
-proc newWebView*(path: static[string] = ""; title = ""; width: Positive = 1000; height: Positive = 700;
+proc newWebView*(path: static[string] = ""; entryType:static[EntryType]; title = ""; width: Positive = 1000; height: Positive = 700;
     resizable: static[bool] = true; debug: static[bool] = not defined(release); callback: ExternalInvokeCb = nil; 
     ): Webview =
   ## Create a new Window with given attributes, all arguments are optional.
@@ -209,7 +210,7 @@ proc newWebView*(path: static[string] = ""; title = ""; width: Positive = 1000;
   var entry = path
   when path.endsWith".js" or path.endsWith".nim":
     entry = dataUriHtmlHeader "<!DOCTYPE html><html><head><meta content='width=device-width,initial-scale=1' name=viewport></head><body id=body ><div id=ROOT ><div></body></html>" # Copied from Karax
-  var webview = webView(title, entry, width, height, resizable, debug, callback)
+  var webview = webView(title, entry, entryType, width, height, resizable, debug, callback)
   when defined(macosx):
     let MyAppDelegate = registerAppDelegate()
     let WindowController = registerWindowController()