fix py2.py3 import thx @electronstudio

harfang3d · Feb 21, 2024 · cc63d7c · cc63d7c
1 parent f85dfd1
commit cc63d7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/pygbag/support/cross/aio/pep0723.py b/src/pygbag/support/cross/aio/pep0723.py
@@ -303,7 +303,7 @@ async def pip_install(pkg, sysconf={}):
                 if html:
                     for line in html.readlines():
                         if line.find("href=") > 0:
-                            if line.find("-py3-none-any.whl") > 0:
+                            if line.find("py3-none-any.whl") > 0:
                                 wheel_url = line.split('"', 2)[1]
                 else:
                     print("283: ERROR: cannot find package :", pkg)

diff --git a/static/pythons.js b/static/pythons.js
@@ -1036,16 +1036,20 @@ async function feat_vtx(debug_hidden) {
         document.body.appendChild(terminal)
     }
 
+    const cols = get_terminal_cols()
+    const cons = get_terminal_console()
     const { WasmTerminal } = await import("./vtx.js")
-    const lines = get_terminal_lines() + get_terminal_console()  // including virtual get_terminal_console()
+    const lines = get_terminal_lines() + cons  // including virtual get_terminal_console()
     const py = window.document.body.clientHeight
     var fntsize = Math.floor(py/lines) - 1
 
+    if (lines<=33)
+        fntsize = fntsize - 5
 
-    console.warn("fnt:",window.document.body.clientHeight ,"/", lines,"=", fntsize)
+    console.warn("fnt:",window.document.body.clientHeight ,"/", lines,"=", fntsize, " Cols:", cols, "Cons:", cons)
     vm.vt = new WasmTerminal(
         "terminal",
-        get_terminal_cols(),
+        cols,
         lines,
         fntsize,
         config.fbdev,