tkinterweb 4.16.7__tar.gz → 4.16.9__tar.gz

{tkinterweb-4.16.7/tkinterweb.egg-info → tkinterweb-4.16.9}/PKG-INFO

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

{tkinterweb-4.16.7 → tkinterweb-4.16.9}/setup.py

@@ -6,7 +6,7 @@ README = (HERE / "README.md").read_text()
 
 setup(
     name="tkinterweb",
-    version="4.16.7",
+    version="4.16.9",
     python_requires=">=3.2",
     description="HTML/CSS viewer, editor, and app builder for Tkinter",
     long_description=README,

{tkinterweb-4.16.7 → tkinterweb-4.16.9}/tkinterweb/bindings.py

@@ -50,12 +50,13 @@ class TkinterWeb(tk.Widget):
         #    kwargs["logcmd"] = tkhtml_notifier
 
         # Set the default style if needed
+        if kwargs.get("shrink", False) == True:
+            # will be much easier once I remove default_style
+            setattr(self, "default_style", getattr(self, "default_style", "") + utilities.SHRINK_STYLE)
+
         if kwargs.get("defaultstyle", "") == "" and self.default_style:
             kwargs["defaultstyle"] = self.default_style
 
-        if kwargs.get("shrink", False) == True:
-            kwargs["defaultstyle"] += utilities.SHRINK_STYLE
-
         # Unset width and height if -0
         if kwargs.get("width") == 0: 
             del kwargs["width"]

{tkinterweb-4.16.7 → tkinterweb-4.16.9}/tkinterweb/extensions.py

@@ -289,7 +289,7 @@ class CaretManager(utilities.BaseManager):
     :ivar target_offset: The text offset used for traversing up/down.
     :ivar blink_delay: The caret's blink delay, in milliseconds. Updated in version 4.11.
     :ivar caret_width: The caret's width, in pixels. New in version 4.11.
-    :ivar caret_colour: The caret's colour. If None, the text colour under it will be matched.
+    :ivar caret_color: The caret's colour. If None, the text colour under it will be matched.
     :ivar scrolling_threshold: If the distance between the visible part of the page and the caret is nonzero but is less than this number, a scrolling animation will play.
     :ivar scrolling_teleport: If the distance between the visible part of the page and the caret is nonzero but is greater than :attr:`scrolling_threshold`, the page is scrolled to this number before the scrolling animation plays.
     
@@ -307,7 +307,7 @@ class CaretManager(utilities.BaseManager):
 
         self.blink_delays = [600, 300]
         self.caret_width = 1
-        self.caret_colour = None
+        self.caret_color = None
         self.scrolling_threshold = 300 
         self.scrolling_teleport = 75
 
@@ -549,8 +549,8 @@ class CaretManager(utilities.BaseManager):
         xoffset = self._scroll_if_needed(a, c, x1, x2, auto_scroll, 1)
 
         if (xoffset != None) and (yoffset != None): # Otherwise, yview/xview automatically re-calls this function, so we exit
-            if self.caret_colour:
-                bg = self.caret_colour
+            if self.caret_color:
+                bg = self.caret_color
             else:
                 bg = self.html.get_node_property(self.html.get_node_parent(self.node), "color")
             self.caret_frame.config(height=d-b, bg=bg, width=self.caret_width)

{tkinterweb-4.16.7 → tkinterweb-4.16.9}/tkinterweb/htmlwidgets.py

@@ -91,19 +91,19 @@ class HtmlFrame(Frame):
     :param ignore_invalid_images: If enabled and alt text is disabled or the image has no alt text, a broken image icon will be displayed in place of the image.
     :type ignore_invalid_images: bool
 
-    Widget colors and styling:
+    Widget colours and styling:
 
-    :param find_match_highlight_color: The highlight color of matches found by :py:func:`find_text()`. 
+    :param find_match_highlight_color: The background colour of matches found by :py:func:`find_text()`. 
     :type find_match_highlight_color: str
-    :param find_match_text_color: The text color of matches found by :py:func:`find_text()`. 
+    :param find_match_text_color: The foreground colour of matches found by :py:func:`find_text()`. 
     :type find_match_text_color: str
-    :param find_current_highlight_color: The highlight color of the current match selected by :py:func:`find_text()`. 
+    :param find_current_highlight_color: The background colour of the current match selected by :py:func:`find_text()`. 
     :type find_current_highlight_color: str
-    :param find_current_text_color: The text color of the current match selected by :py:func:`find_text()`. 
+    :param find_current_text_color: The foreground colour of the current match selected by :py:func:`find_text()`. 
     :type find_current_text_color: str
-    :param selected_text_highlight_color: The highlight color of selected text. 
+    :param selected_text_highlight_color: The background colour of selected text. 
     :type selected_text_highlight_color: str
-    :param selected_text_color: The text color of selected text. 
+    :param selected_text_color: The foreground colour of selected text. 
     :type selected_text_color: str
 
     Download behaviour:
@@ -1114,10 +1114,13 @@ class HtmlFrame(Frame):
 
     def _handle_frame_resize(self, event):
         # Tkhtml doesn't handle resizing outwards when shrink is enabled
+        # Disabling text wrapping works great except that it has no effect on multiple inline text nodes in Tkhtml
+
         # When the widget resizes, resize it to the screen's width, and let it shrink back
         # Otherwise, the widget will shrink when it can and return
         # Not ideal, but still less ideal than the default behaviour
 
+        ### TODO: Needs improvement
         ### TODO: Fix from within Tkhtml???
 
         if self.unshrink:
@@ -1386,7 +1389,7 @@ class HtmlLabel(HtmlFrame):
     
     This widget also accepts one additional parameter:
 
-    :param text: The HTML content of the widget
+    :param text: The HTML or text content of the widget
     :type text: str
 
     By default the widget will be styled to match the :py:class:`ttk.Label` style. To change this, alter the ttk style or use CSS.
@@ -1468,23 +1471,23 @@ class HtmlText(HtmlFrame):
 
     This widget accepts the following :py:class:`tk.Text` parameters:
 
-    :param background:
+    :param background: the widget's background colour
     :type background: str
-    :param foreground:
+    :param foreground: the widget's foreground (text) colour
     :type foreground: str
-    :param selectbackground:
+    :param selectbackground: the background colour of selected text
     :type selectbackground: str
-    :param selectforeground:
+    :param selectforeground: the foreground colour of selected text
     :type selectforeground: str
-    :param insertontime:
+    :param insertontime: the number of milliseconds the insertion cursor is visible
     :type insertontime: int
-    :param insertofftime:
+    :param insertofftime: the number of milliseconds the insertion cursor is invisible
     :type insertofftime: int
-    :param insertwidth:
+    :param insertwidth: the width of the insertion cursor in pixels
     :type insertwidth: int
-    :param insertbackground:
+    :param insertbackground: the background colour of the insertion cursor
     :type insertbackground: str
-    :param state:
+    :param state: the widget's state (``"normal"`` or ``"disabled"``)
     :type state: str
 
     Changed in version 4.15.
@@ -1931,7 +1934,7 @@ class HtmlText(HtmlFrame):
             value = self._check_value(self._html.caret_manager.caret_width, kwargs.pop("insertwidth"))
             self._html.caret_manager.caret_width = value
         if "insertbackground" in kwargs:
-            self._html.caret_manager.caret_colour = kwargs.pop("insertbackground")
+            self._html.caret_manager.caret_color = kwargs.pop("insertbackground")
         if "state" in kwargs:
             state = kwargs.pop("state")
             if state == "enabled":
@@ -1966,7 +1969,7 @@ class HtmlText(HtmlFrame):
         elif "insertwidth" == key:
             return self._html.caret_manager.caret_width
         elif "insertbackground" == key:
-            return self._html.caret_manager.caret_colour
+            return self._html.caret_manager.caret_color
         elif "state" == key:
             return "enabled" if self._html.caret_browsing_enabled else "disabled"
         

{tkinterweb-4.16.7 → tkinterweb-4.16.9}/tkinterweb/utilities.py

@@ -31,7 +31,7 @@ __title__ = "TkinterWeb"
 __author__ = "Andrew Clarke"
 __copyright__ = "(c) 2021-2025 Andrew Clarke"
 __license__ = "MIT"
-__version__ = "4.16.7"
+__version__ = "4.16.9"
 
 
 ROOT_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), "resources")
@@ -96,8 +96,7 @@ DEFAULT_STYLE = r"""
                 { display: block }
 HEAD, SCRIPT, TITLE { display: none }
 BODY {
-  margin:8px;
-  white-space: nowrap;
+  margin: 8px;
 }
 /* Rules for lists */
 LI                   { display: list-item }
@@ -448,7 +447,7 @@ INPUT[type="submit"],INPUT[type="button"], INPUT[type="reset"], BUTTON {
 }
 """
 
-SHRINK_STYLE = "BODY { white-space: nowrap }"
+SHRINK_STYLE = "BODY { white-space: nowrap; }"
 
 class BuiltinPageGenerator():
     """BUILTIN_PAGES used to be a dictionary of URIs and corresponding HTML code.

{tkinterweb-4.16.7 → tkinterweb-4.16.9/tkinterweb.egg-info}/PKG-INFO

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