tkinterweb 4.16.10__tar.gz → 4.17.0__tar.gz

{tkinterweb-4.16.10/tkinterweb.egg-info → tkinterweb-4.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkinterweb
-Version: 4.16.10
+Version: 4.17.0
 Summary: HTML/CSS viewer, editor, and app builder for Tkinter
 Home-page: https://github.com/Andereoo/TkinterWeb
 License: MIT

{tkinterweb-4.16.10 → tkinterweb-4.17.0}/setup.py

@@ -6,7 +6,7 @@ README = (HERE / "README.md").read_text()
 
 setup(
     name="tkinterweb",
-    version="4.16.10",
+    version="4.17.0",
     python_requires=">=3.2",
     description="HTML/CSS viewer, editor, and app builder for Tkinter",
     long_description=README,
@@ -27,13 +27,13 @@ setup(
     include_package_data=True,
     install_requires=["tkinterweb-tkhtml>=2.1.0"],
     extras_require = {
-          "html": ["tkinterweb-tkhtml-extras>=1.1.1"],
+          "html": ["tkinterweb-tkhtml-extras>=1.2.0"],
           "images": ["pillow"],
-          "svg": ["tkinterweb-tkhtml-extras>=1.1.1", "pillow", "cairosvg"],
+          "svg": ["tkinterweb-tkhtml-extras>=1.2.0", "pillow", "cairosvg"],
           "javascript": ["pythonmonkey"],
           "requests": ["brotli"],
 
-          "recommended": ["tkinterweb-tkhtml-extras>=1.1.1", "pillow"],
-          "full": ["tkinterweb-tkhtml-extras>=1.1.1", "pillow", "cairosvg", "pythonmonkey", "brotli"],
+          "recommended": ["tkinterweb-tkhtml-extras>=1.2.0", "pillow"],
+          "full": ["tkinterweb-tkhtml-extras>=1.2.0", "pillow", "cairosvg", "pythonmonkey", "brotli"],
     },
 )

{tkinterweb-4.16.10 → tkinterweb-4.17.0}/tkinterweb/bindings.py

@@ -36,6 +36,9 @@ class TkinterWeb(tk.Widget):
         _delayed_options = {"dark_theme_enabled", "caches_enabled", "threading_enabled"}
         tkinterweb_options = self._setup_settings(tkinterweb_options, _delayed_options)
 
+        # Load Tkhtml3
+        self._load_tkhtml()
+
         # Register image loading infrastructure
         if "imagecmd" not in kwargs:
             kwargs["imagecmd"] = master.register(self._on_image_cmd)
@@ -49,14 +52,27 @@ class TkinterWeb(tk.Widget):
         # if "logcmd" not in kwargs:
         #    kwargs["logcmd"] = tkhtml_notifier
 
-        # Set the default style if needed
-        if kwargs.get("shrink", False) == True and self.default_style:
-            self.default_style += utilities.SHRINK_STYLE
+        shrink = bool(kwargs.get("shrink"))
+        textwrap = kwargs.get("textwrap")
+
+        # Set the textwrap value if needed
+        if self.using_tkhtml30:
+            if self.default_style:
+                # For Tkhtml 3.0, we do our best by applying CSS to block word wrapping
+                if textwrap == "auto" and shrink:
+                    self.default_style += utilities.TEXTWRAP_STYLE
+                elif not textwrap:
+                    self.default_style += utilities.TEXTWRAP_STYLE
+            # Version 3.0 doesn't support textwrap
+            kwargs.pop("textwrap", None)
+        elif textwrap == "auto":
+            kwargs["textwrap"] = not(shrink)
 
-        if kwargs.get("defaultstyle", "") == "" and self.default_style:
+        # Set the default style if needed
+        if not kwargs.get("defaultstyle", "") and self.default_style:
             kwargs["defaultstyle"] = self.default_style
 
-        # Unset width and height if -0
+        # Unset width and height if null
         if kwargs.get("width") == 0: 
             del kwargs["width"]
         if kwargs.get("height") == 0: 
@@ -65,8 +81,7 @@ class TkinterWeb(tk.Widget):
         # Provide OS information for troubleshooting
         self.post_message(f"Starting TkinterWeb for {utilities.PLATFORM.processor} {utilities.PLATFORM.system} with Python {'.'.join(utilities.PYTHON_VERSION)}")
 
-        # Load and initialize the Tkhtml3 widget
-        self._load_tkhtml()
+        # Initialize the Tkhtml3 widget
         tk.Widget.__init__(self, master, "html", kwargs)
 
         # Setup threading settings
@@ -312,6 +327,7 @@ It is likely that not all dependencies are installed. Make sure Cairo is install
                 self.post_message(f"Tkhtml {loaded_version} successfully loaded")
 
         self.tkhtml_version = loaded_version
+        self.using_tkhtml30 = loaded_version == "3.0"
 
     # --- Extensions ----------------------------------------------------------
 
@@ -1065,7 +1081,7 @@ It is likely that not all dependencies are installed. Make sure Cairo is install
             data = "".join(c for c in data if c <= "\uFFFF")
 
             # I moved these workarounds to Tkhtml in version 3.1
-            if self.tkhtml_version == "3.0":
+            if self.using_tkhtml30:
                 data = sub(
                     "font-family:[^;']*(;)?",
                     self._remove_noto_emoji,

{tkinterweb-4.16.10 → tkinterweb-4.17.0}/tkinterweb/handlers.py

@@ -796,9 +796,11 @@ class ObjectManager(utilities.BaseManager):
         "Handle <iframe> elements."
         src = self.html.get_node_attribute(node, "src")
         srcdoc = self.html.get_node_attribute(node, "srcdoc")
-        scrolling = "auto"
+        
         if self.html.get_node_attribute(node, "scrolling") == "no":
             scrolling = False
+        else:
+            scrolling = "auto"
 
         if srcdoc:
             self._create_iframe(node, None, srcdoc, scrolling)
@@ -826,6 +828,7 @@ class ObjectManager(utilities.BaseManager):
                 message_func=self.html.message_func,
                 overflow_scroll_frame=self.html,
                 stylesheets_enabled = self.html.stylesheets_enabled,
+                vertical_scrollbar = vertical_scrollbar,
                 images_enabled = self.html.images_enabled,
                 forms_enabled = self.html.forms_enabled,
                 objects_enabled = self.html.objects_enabled,

{tkinterweb-4.16.10 → tkinterweb-4.17.0}/tkinterweb/htmlwidgets.py

@@ -42,14 +42,19 @@ class HtmlFrame(Frame):
     :type zoom: float
     :param fontscale: The page fontscale multiplier.
     :type fontscale: float
-    :param vertical_scrollbar: Show the vertical scrollbar. Consider using the CSS ``overflow`` property on the ``<html>`` or ``<body>`` element instead.
-    :type vertical_scrollbar: bool or "auto"
-    :param horizontal_scrollbar: Show the horizontal scrollbar. It is usually best to leave this hidden. Consider adding the ``tkinterweb-overflow-x="scroll" | "auto" | "hidden"`` attribute on the ``<html>`` or ``<body>`` element instead.
-    :type horizontal_scrollbar: bool or "auto"
-    :param shrink: If False, the widget's width and height are set by the width and height options as per usual. If this option is set to True, the widget's width and height are determined by the current document.
-    :type shrink: bool
     :param defaultstyle: The default stylesheet to use when parsing HTML. Use caution when changing this setting. The default is ``tkintereb.utilities.DEFAULT_STYLE``.
     :type defaultstyle: str
+
+    Widget sizing and overflow:
+
+    :param vertical_scrollbar: Show the vertical scrollbar. You can also set the CSS ``overflow`` property on the ``<html>`` or ``<body>`` element instead.
+    :type vertical_scrollbar: bool, "auto", or "dynamic"
+    :param horizontal_scrollbar: Show the horizontal scrollbar. It is usually best to leave this hidden. You can also set the ``tkinterweb-overflow-x="scroll" | "auto" | "hidden"`` attribute on the ``<html>`` or ``<body>`` element instead.
+    :type horizontal_scrollbar: bool, "auto", or "dynamic"
+    :param shrink: If False, the widget's width and height are set by the width and height options as per usual. If this option is set to True, the widget's width and height are determined by the current document.
+    :type shrink: bool
+    param textwrap: Determines whether text is allowed to wrap. This is similar to the CSS ``text-wrap: normal | nowrap`` property, but more forceful. By default, wrapping will be disabled when shrink is True and will be enabled when shrink is False. Make sure the tkinterweb-tkhtml-extras package is installed; this is only partially supported in Tkhtml version 3.0. New in version 4.17.
+    :type textwrap: bool or "auto"
     
     Debugging:
 
@@ -136,7 +141,7 @@ class HtmlFrame(Frame):
     
     :raise TypeError: If the value type is wrong and cannot be converted to the correct type."""
 
-    def __init__(self, master, *, zoom = 1.0, fontscale = 1.0, messages_enabled = True, vertical_scrollbar = "auto", horizontal_scrollbar = False, \
+    def __init__(self, master, *, zoom = 1.0, fontscale = 1.0, messages_enabled = True, vertical_scrollbar = "dynamic", horizontal_scrollbar = False, \
                     on_navigate_fail = None, on_link_click = None, on_form_submit = None, on_script = None, on_element_script = None, on_resource_setup = None, \
                     message_func = utilities.notifier, request_func = None, caret_browsing_enabled = False, selection_enabled = True, \
                     stylesheets_enabled = True, images_enabled = True, forms_enabled = True, objects_enabled = True, caches_enabled = True, \
@@ -146,7 +151,7 @@ class HtmlFrame(Frame):
                     find_current_text_color = "#000", selected_text_highlight_color = "#9bc6fa", selected_text_color = "#000", \
                     insecure_https = False, ssl_cafile = None, request_timeout = 15, headers = utilities.HEADERS, experimental = False, \
                     use_prebuilt_tkhtml = True, tkhtml_version = "", parsemode = utilities.DEFAULT_PARSE_MODE, \
-                    shrink = False, mode = utilities.DEFAULT_ENGINE_MODE, defaultstyle = "", height = 0, width = 0, **kwargs):
+                    shrink = False, textwrap="auto", mode = utilities.DEFAULT_ENGINE_MODE, defaultstyle = "", height = 0, width = 0, **kwargs):
         
         # State and settings variables
         self._current_url = ""
@@ -226,6 +231,7 @@ class HtmlFrame(Frame):
             "fontscale": fontscale,
             "parsemode": parsemode,
             "shrink": shrink,
+            "textwrap": textwrap,
             "mode": mode,
             "defaultstyle": defaultstyle,
             "height": height,
@@ -1131,18 +1137,23 @@ class HtmlFrame(Frame):
                 )
                 self._prev_configure = (event.width, event.x)
 
+    def _adjust_allow(self, allow):
+        if allow == "auto":
+            allow = 2
+        elif allow == "dynamic":
+            if self._html.cget("shrink") == 1:
+                allow = 0
+            else:
+                allow = 2
+        return allow
+
     def _manage_vsb(self, allow=None, check=False):
         "Show or hide the scrollbars."
         if check:
             return self._vsb.scroll
-        
         if allow == None:
             allow = self.vertical_scrollbar
-        if allow == "auto":
-            if self._html.cget("shrink") == 1:
-                allow = 0
-            else:
-                allow = 2
+        allow = self._adjust_allow(allow)
         self._vsb.set_type(allow, *self._html.yview())
         return allow
     
@@ -1150,14 +1161,9 @@ class HtmlFrame(Frame):
         "Show or hide the scrollbars."
         if check:
             return self._hsb.scroll
-
         if allow == None:
             allow = self.horizontal_scrollbar
-        if allow == "auto":
-            if self._html.cget("shrink") == 1:
-                allow = 0
-            else:
-                allow = 2
+        allow = self._adjust_allow(allow)
         self._hsb.set_type(allow, *self._html.xview())
         return allow
 

{tkinterweb-4.16.10 → tkinterweb-4.17.0}/tkinterweb/utilities.py

@@ -31,7 +31,7 @@ __title__ = "TkinterWeb"
 __author__ = "Andrew Clarke"
 __copyright__ = "(c) 2021-2025 Andrew Clarke"
 __license__ = "MIT"
-__version__ = "4.16.10"
+__version__ = "4.17.0"
 
 
 ROOT_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), "resources")
@@ -447,7 +447,7 @@ INPUT[type="submit"],INPUT[type="button"], INPUT[type="reset"], BUTTON {
 }
 """
 
-SHRINK_STYLE = "BODY { white-space: nowrap; }"
+TEXTWRAP_STYLE = "BODY { white-space: nowrap; }"
 
 class BuiltinPageGenerator():
     """BUILTIN_PAGES used to be a dictionary of URIs and corresponding HTML code.

{tkinterweb-4.16.10 → tkinterweb-4.17.0/tkinterweb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tkinterweb
-Version: 4.16.10
+Version: 4.17.0
 Summary: HTML/CSS viewer, editor, and app builder for Tkinter
 Home-page: https://github.com/Andereoo/TkinterWeb
 License: MIT

{tkinterweb-4.16.10 → tkinterweb-4.17.0}/tkinterweb.egg-info/requires.txt

@@ -5,10 +5,10 @@ brotli
 cairosvg
 pillow
 pythonmonkey
-tkinterweb-tkhtml-extras>=1.1.1
+tkinterweb-tkhtml-extras>=1.2.0
 
 [html]
-tkinterweb-tkhtml-extras>=1.1.1
+tkinterweb-tkhtml-extras>=1.2.0
 
 [images]
 pillow
@@ -18,7 +18,7 @@ pythonmonkey
 
 [recommended]
 pillow
-tkinterweb-tkhtml-extras>=1.1.1
+tkinterweb-tkhtml-extras>=1.2.0
 
 [requests]
 brotli
@@ -26,4 +26,4 @@ brotli
 [svg]
 cairosvg
 pillow
-tkinterweb-tkhtml-extras>=1.1.1
+tkinterweb-tkhtml-extras>=1.2.0