ttkbootstrap 2.2.0__tar.gz → 2.2.1__tar.gz

{ttkbootstrap-2.2.0/src/ttkbootstrap.egg-info → ttkbootstrap-2.2.1}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: ttkbootstrap
-Version: 2.2.0
-Summary: A supercharged theme extension for tkinter that enables on-demand modern flat style themes inspired by Bootstrap.
+Version: 2.2.1
+Summary: Modern themes for Tkinter. Sleek, responsive styles inspired by Bootstrap. Includes ready-to-use widgets, 30+ themes, and tools for building beautiful, cross-platform desktop apps with ease.
 Author-email: Israel Dryer <israel.dryer@gmail.com>
 License-Expression: MIT AND (Apache-2.0 OR BSD-2-Clause)
 Project-URL: Homepage, https://github.com/israel-dryer/ttkbootstrap

{ttkbootstrap-2.2.0 → ttkbootstrap-2.2.1}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ttkbootstrap"
-version = "2.2.0"
-description = "A supercharged theme extension for tkinter that enables on-demand modern flat style themes inspired by Bootstrap."
+version = "2.2.1"
+description = "Modern themes for Tkinter. Sleek, responsive styles inspired by Bootstrap. Includes ready-to-use widgets, 30+ themes, and tools for building beautiful, cross-platform desktop apps with ease."
 readme = "README.md"
 requires-python = ">=3.10"
 license = "MIT AND (Apache-2.0 OR BSD-2-Clause)"

{ttkbootstrap-2.2.0 → ttkbootstrap-2.2.1}/src/ttkbootstrap/style/builders_tk.py

@@ -13,6 +13,45 @@ from ttkbootstrap.style.theme import Colors, ThemeDefinition, _accent_on_color
 _MENU_HAIRLINE_TAG = "TtkbootstrapMenuHairline"
 
 
+def _is_menubar(widget: tk.Menu) -> bool:
+    """True when `widget` is serving as a window's menubar.
+
+    Painting one floods the bar with the border color, because a menubar's
+    entries cover only its left. This used to be inferred from `<Map>` -- a
+    menubar is displayed through a clone, so the widget styled here did not map
+    -- but that is a property of the build, not a guarantee: on CI's x11 it does
+    map under CPython 3.13.15 and does not under 3.10.20, on the *same* Tk
+    (8.6.14), which painted every x11 menubar. Ask directly instead, so the
+    invariant no longer depends on what the interpreter and Tk happen to do.
+
+    Two ways to serve as a menubar, since either widget may be the one that maps:
+    the menu installed as some window's ``-menu``, or the clone Tk displays for
+    it (``-type menubar``; the original stays ``normal``).
+
+    The windows checked are the menu's own toplevel, the root, and the root's
+    direct children -- not a walk of the whole tree. A cascade posts its submenu
+    on every hover, so this runs at pointer speed and cannot afford to
+    instantiate a wrapper for every widget in the app. That covers a menubar
+    built on the window it serves, which is how one is written; a menu parented
+    to one window and installed on a *nested* toplevel would be missed.
+    """
+    if str(widget.cget("type")) == "menubar":
+        return True
+    name = str(widget)
+    root = widget._root()
+    windows = [widget.winfo_toplevel(), root]
+    windows.extend(
+        w for w in root.winfo_children() if isinstance(w, tk.Toplevel)
+    )
+    for window in windows:
+        try:
+            if str(window.cget("menu")) == name:
+                return True
+        except tk.TclError:
+            continue  # not a window, or torn down mid-check
+    return False
+
+
 def _on_menu_map(event):
     """Repaint a popup menu's border as it is posted.
 
@@ -342,13 +381,17 @@ class StyleBuilderTK:
         popup, so only the 1px strip is left showing.
 
         That only holds for a popup. A menubar's entries cover just the left of
-        the bar, so the border color would flood the rest of it -- which is why
-        this waits for `<Map>`: a menu used as a menubar is displayed through a
-        clone, so the widget styled here never maps and never gets painted.
+        the bar, so the border color would flood the rest of it -- so a menubar
+        is refused here, at the one place that paints, rather than at each
+        caller. Waiting for `<Map>` is still what defers a popup's paint until it
+        is posted; it is no longer what keeps a menubar out (see `_is_menubar`).
 
         Entry colors are theme-managed, like those of a themed `Text`. An entry
         the user gave its own color keeps it; the rest follow the theme.
         """
+        if _is_menubar(widget):
+            return
+
         surface = self.colors.bg
         previous = getattr(widget, "_tb_menu_entry_bg", None)
         widget.configure(background=self.colors.border)

{ttkbootstrap-2.2.0 → ttkbootstrap-2.2.1/src/ttkbootstrap.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: ttkbootstrap
-Version: 2.2.0
-Summary: A supercharged theme extension for tkinter that enables on-demand modern flat style themes inspired by Bootstrap.
+Version: 2.2.1
+Summary: Modern themes for Tkinter. Sleek, responsive styles inspired by Bootstrap. Includes ready-to-use widgets, 30+ themes, and tools for building beautiful, cross-platform desktop apps with ease.
 Author-email: Israel Dryer <israel.dryer@gmail.com>
 License-Expression: MIT AND (Apache-2.0 OR BSD-2-Clause)
 Project-URL: Homepage, https://github.com/israel-dryer/ttkbootstrap

{ttkbootstrap-2.2.0 → ttkbootstrap-2.2.1}/tests/test_menu_border.py

@@ -16,10 +16,12 @@ against real pixels on X11 (``xwd`` capture of a posted menu, all four edges
 reading exactly ``colors.border``); a headless suite cannot post and capture.
 """
 
+from types import SimpleNamespace
+
 import pytest
 
 import ttkbootstrap as ttk
-from ttkbootstrap.style.builders_tk import _MENU_HAIRLINE_TAG
+from ttkbootstrap.style.builders_tk import _MENU_HAIRLINE_TAG, _on_menu_map
 from ttkbootstrap.style.scaling import Scaling
 
 
@@ -87,19 +89,55 @@ def test_a_never_posted_menu_is_not_painted(root, x11):
     """The guard that keeps a menubar intact.
 
     A menubar's entries cover only the left of the bar, so painting it would
-    flood the rest with the border color. Tk displays a menubar through a
-    *clone*, so the widget styled here never maps -- and only a map paints.
+    flood the rest with the border color.
+    """
+    menubar = ttk.Menu(root)
+    menubar.add_cascade(label="File")
+    root.configure(menu=menubar)
+    try:
+        assert str(menubar.cget("background")) == root.style.colors.bg
+        assert not getattr(menubar, "_tb_menu_hairline", False)
+    finally:
+        root.configure(menu="")
+
+
+def test_a_menubar_that_maps_is_still_not_painted(root, x11):
+    """The same guard, forced instead of trusted.
+
+    The test above only shows the menubar went unpainted *because it never
+    mapped* -- and that is a property of the build, not a guarantee. Tk displays
+    a menubar through a clone, so historically the widget styled here did not
+    map; under CPython 3.13.15 it does, which painted every x11 menubar in the
+    border color. Not the Tk version either: CI's 3.10 job does not map it on
+    the same Tk 8.6.14. Deliver the `<Map>` by hand so the refusal is asserted
+    on every box regardless of what the local build does.
     """
     menubar = ttk.Menu(root)
     menubar.add_cascade(label="File")
     root.configure(menu=menubar)
     try:
+        _on_menu_map(SimpleNamespace(widget=menubar))
         assert str(menubar.cget("background")) == root.style.colors.bg
         assert not getattr(menubar, "_tb_menu_hairline", False)
     finally:
         root.configure(menu="")
 
 
+def test_a_mapped_popup_is_painted(root, x11):
+    """The positive control for the guard above.
+
+    Refusing to paint a menubar is only correct if a popup arriving down the
+    same path still gets its border -- otherwise the guard could be over-broad
+    and no test would notice.
+    """
+    popup = ttk.Menu(root)
+    popup.add_command(label="Open")
+
+    _on_menu_map(SimpleNamespace(widget=popup))
+    assert str(popup.cget("background")) == root.style.colors.border
+    assert popup._tb_menu_hairline is True
+
+
 def test_entries_follow_a_theme_switch(root, x11):
     menu = ttk.Menu(root)
     menu.add_command(label="Open")