mirror of
https://github.com/kuhyx/diet-guard.git
synced 2026-11-11 20:53:53 +01:00
Krzysztof Rudnicki
1702685afd
The Log Meal tab did not fit this laptop, and had not for some time. Measured
under a real 1366x768 X server: it required 866px inside a 739px content pane
with every field EMPTY, and 938px with a day of meals logged.
Because the content frame was place()-centred it was sheared at BOTH edges at
once -- the "Diet Gate" title and the slot header (which meal you are being
asked to log) off the top, the calorie headline and the whole dashboard off the
bottom -- with no scrollbar anywhere in the package and nothing to indicate
content was missing. This is a hard lock: overrideredirect, a global grab, VT
switching disabled. Unreachable content is unrecoverable.
Two independent causes, both needed fixing:
- Every font size was handed to Tk as *points*. Tk encodes the unit in the
SIGN of the size, and _gatelock_typography carried a comment asserting the
opposite ("Tk has no separate px/pt distinction"). At ~100 DPI that made
every string ~30% oversized. Negative sizes now; the docstring records why.
- There was no scroll container. build_layout now uses gatelock's
ScrollableSurface, which top-anchors, scrolls by keyboard, and scrolls to
follow focus.
Font sizes alone were not enough: they take the layout to 702px, still over the
571px pane at 1024x600. Both fixes are load-bearing.
The grams/items selector was mouse-only. tk.OptionMenu's Menubutton defaults to
takefocus=0, so ::tk::FocusOK rejects it and it never entered the tab ring --
verified by walking the real ring, which ran Entry -> Text -> Listbox -> Button
-> TNotebook and skipped it entirely. Switching units rescales the whole entry,
so a pointerless user could not correct "250 grams" to "3 items" inside a lock
they cannot leave without logging a meal. It is now two Radiobuttons, which are
in the ring by default and take both Space and Return -- and which post nothing,
unlike a menu, whose grab-stealing is why screen-locker bans OptionMenu on lock
surfaces outright.
Also: the focus ring was invisible (Tk's default is 1px BLACK on #211D1B) and
_build_desc actively inverted it by setting highlightbackground, the UNfocused
ring, so the box outlined while idle and went black the moment it took focus.
Enter now activates buttons (X11 Tk binds only <space>). Text widgets no longer
trap Tab. notebook.enable_traversal() is called, so Ctrl+Tab and Ctrl+PageDown
work. wraplength drops 900 -> 640, the line-length cap, which also stops a
label forcing a 900px-wide layout onto a 1024px screen.
The Flutter app had two controls with no keyboard route at all. Its desktop
target is the web build in a Chrome --app window, so a touch gesture is not a
fallback there, it is the only interaction:
- Deleting a history entry was bound solely to onLongPress. Long-press has no
keyboard equivalent whatsoever. It now has a focusable IconButton; the
long-press stays as a redundant pointer shortcut.
- Calendar day cells were a bare GestureDetector, so navigating to
date-filtered history was pointer-only and invisible to a screen reader.
Now Semantics(button: true) over an InkWell.
Plus: the filter sheet built a TextEditingController inside build() with the
caret forced to end-of-text, so every keystroke discarded it and silently undid
mid-string Home/End/arrow editing. And nothing capped width, so on the 1366px
desktop window prose ran ~180 characters per line (twice the readable limit)
and a four-digit kcal field spanned ~1334px. AppWidth adds those caps.
Tests: the render check is a failing test, not a script -- ruff runs with
--unsafe-fixes, whose T201 fix DELETES print statements, which would silently
turn a diagnostic into a no-op. test_gate_layout_fits.py was verified red on
the pre-fix code ("content 866 in viewport 768 -> NO SCROLL VIEWPORT ->
UNREACHABLE CONTENT") and green after. The Flutter suite gains its first
keyboard-reachability assertions; it previously had ~109 tester.tap calls and
zero checks that anything was focusable.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
38 lines
1.6 KiB
Python
38 lines
1.6 KiB
Python
"""Shared type scale for the diet_guard gate (tokens.md's typography scale).
|
|
|
|
Split out so :mod:`._gatelock_ui`, :mod:`._gatelock_calendar`, and
|
|
:mod:`._gatelock_buttons` read the same sizes instead of each picking its
|
|
own value per label -- see ``DESIGN_AUDIT_TODO.md``.
|
|
|
|
**These are Tk font sizes, and Tk encodes the unit in the sign: positive
|
|
means points, negative means pixels.** The design-system scale in
|
|
``~/utils/unified-design-system/tokens.md`` is in *pixels*, so every constant
|
|
here is negative.
|
|
|
|
This module previously carried the positive values with a comment asserting
|
|
that "Tk has no separate px/pt distinction". That premise was wrong, and the
|
|
consequence was not cosmetic: at ~100 DPI a positive 16 renders with a 26px
|
|
linespace where a negative 16 gives 20px, so every string in the gate was
|
|
~30% oversized. That alone pushed the Log Meal tab to 866px of required
|
|
height inside a 739px pane on a 1366x768 screen -- clipping the title and the
|
|
dashboard symmetrically, with no scrollbar to recover them. Keep the signs
|
|
negative; ``tests/test_gatelock_typography.py`` enforces it, and
|
|
``tests/measure_gate_layout.py`` enforces the height that depends on it.
|
|
|
|
``gatelock.LockConfig`` grew the same scale (plus ``LockConfig.font()``, which
|
|
applies the sign for you). Once the gatelock pin here moves past v0.2.1, this
|
|
module should become a thin re-export of that shared scale rather than a
|
|
second copy.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
# Pixel sizes from tokens.md, negated for Tk. Keep in sync with
|
|
# gatelock.LockConfig.type_* until this module can defer to it.
|
|
DISPLAY = -32
|
|
TITLE = -24
|
|
SUBTITLE = -20
|
|
BODY = -16
|
|
LABEL = -14
|
|
CAPTION = -12
|