ltk: responsive padding/spacing and scrolling, expanded theme palette, and bundled Adwaita cursors
A mixed pass over the default theme and the layout/input core, plus the toolkit's own cursor set. Grouped by area below. == Responsive sizing == Add `Length::dp( px )` — a "design pixel". It interprets `px` against a configurable reference vmin (default 412 px, the eydos mobile reference width) and returns `Vmin( px / reference * 100 ).clamp( px * 0.7, px * 1.5 )`, so a value authored against a mock-up scales with the surface without collapsing on tiny screens or ballooning on a 4K desktop. The reference is process-global, set via `set_design_reference()` and read via `design_reference()` (stored as f32 bits in an AtomicU32); both are re-exported from `lib.rs`. Make container and grid insets relative. `Container`'s four padding fields become `Length` instead of `f32`; every setter (`padding`, `padding_h`, `padding_v`, `padding_top`/`right`/`bottom`/`left`) now takes `impl Into<Length>`, so existing `f32` call sites keep compiling via the `From<f32>` shim. The values are resolved against the viewport in `Container::preferred_size` and in the container draw path (`draw/layout.rs`). `WrapGrid`'s `spacing_x`, `spacing_y` and `padding` get the same treatment, with a `resolved( canvas )` helper funnelling the per-frame resolution and `grid()` seeding `Length::px` defaults. Container tests now compare against `Length::px( … )`. == Scrolling == `Scroll::preferred_size` is now axis-aware. A horizontal-only scroll reports its child's natural height rather than claiming all remaining vertical space, so it no longer steals Y from its siblings when it sits inside a `Column`; vertical and both-axis scrolls keep the spacer-like `( max_width, 0.0 )`. `Column`'s space-distribution correspondingly treats a `Scroll` as a vertical space-claimer only when its axis allows Y. Disambiguate nested scroll viewports by direction. On press the gesture state now collects every scroll viewport under the point (`scroll_candidates`, innermost first) instead of committing to one; on the first 8 px of motion it locks onto the candidate whose axis matches the dominant direction (`scroll_locked`), so a horizontal scroller nested inside a vertical list no longer grabs the wrong axis. The pointer scroll hit test is aligned to the same innermost-first ordering. == Theme palette == `themes/default/theme.json` gains named colours (green / green-deep, yellow, orange / orange-deep, pink / pink-soft, sky-deep, error / error-soft, neutral-tertiary) and new semantic slots in both light and dark modes: `danger`, `text-tertiary`, `accept`, `chip` / `chip-active` / `chip-active-fg`, and `avatar-1` … `avatar-9`. == Cursors == Bundle GNOME's Adwaita cursor theme — the cursors GNOME Shell uses — into `themes/default/cursors/` so a Wayland compositor can draw consistent, complete pointers for ltk applications without the toolkit rasterising cursors itself and without depending on adwaita-icon-theme being installed on the target. The cursors are copied verbatim in XCursor binary format: 35 image files, one per CSS/freedesktop cursor name (default, text, pointer, *-resize, …), plus 27 customary X11 alias symlinks (arrow → default, hand2 → pointer, …); a sibling `cursor.theme` makes the tree a valid XCursor theme. The existing `ltk-theme-default.install` copies `themes/default` recursively, so the directory ships with no packaging change. Applications keep declaring a `CursorShape` per widget over `wp_cursor_shape_v1`; the compositor resolves it against the active theme's `cursors/` directory by name, and the set covers all 34 `CursorShape` variants. Document the set in `themes/default/cursors/README.md` (what it is, the XCursor layout, the full shape list, how the compositor consumes it, guidance for forks) and `themes/default/cursors/LICENSE.md` (attribution and licence options, modelled on the icons catalogue LICENSE). `lib.rs` lists the cursors in its third-party-assets section. Close out licensing in `debian/copyright`: a `Files: themes/default/cursors/*` paragraph records the upstream dual offer (CC-BY-SA-3.0 or LGPL-3, and CC-BY-SA-4.0 for the newer assets) attributed to the GNOME Project, with standalone CC-BY-SA-3.0, CC-BY-SA-4.0 and LGPL-3 paragraphs (summary-plus-canonical-URL for the CC licences, matching the existing CC-BY-4.0 entry; LGPL-3 referencing /usr/share/common-licenses/LGPL-3). The files are unmodified from upstream, so there is nothing to declare under the ShareAlike "indicate if changes were made" clause. Add `tests/cursor_assets.rs`: every `CursorShape` name resolves to a valid XCursor file (Xcur magic, following symlinks), `cursor.theme` is present, no entry is a dangling symlink, and the expected-name list stays in sync with the enum's 34 variants.
This commit is contained in:
58
debian/copyright
vendored
58
debian/copyright
vendored
@@ -62,6 +62,27 @@ Comment:
|
||||
sibling `Sora-LICENSE.txt`. Upstream:
|
||||
https://github.com/sora-xor/sora-font
|
||||
|
||||
Files: themes/default/cursors/*
|
||||
Copyright: 2002-2014 The GNOME Project and the Adwaita icon theme authors
|
||||
License: CC-BY-SA-3.0 or LGPL-3, and CC-BY-SA-4.0
|
||||
Comment:
|
||||
Pointer cursors under themes/default/cursors/ are GNOME's *Adwaita*
|
||||
cursor theme — the cursors GNOME Shell ships — bundled verbatim from
|
||||
the adwaita-icon-theme distribution so the default ltk theme is
|
||||
self-contained (it does not depend on adwaita-icon-theme being
|
||||
installed). The files are in XCursor binary format, one per CSS cursor
|
||||
name (default, text, pointer, *-resize, …) plus the customary X11 alias
|
||||
symlinks (arrow → default, hand2 → pointer, …); the sibling
|
||||
cursor.theme makes the tree a valid XCursor theme. They are unmodified
|
||||
from upstream. A Wayland compositor draws them in response to
|
||||
wp_cursor_shape_v1, so ltk applications get them without bundling their
|
||||
own. Upstream offers the artwork under the disjunction in the License
|
||||
field; redistributing under any one of the options satisfies the
|
||||
licence. Attribution shorthand: "Cursors by the GNOME Project". The
|
||||
full functional and licence notes live in
|
||||
themes/default/cursors/README.md and themes/default/cursors/LICENSE.md.
|
||||
Upstream: https://gitlab.gnome.org/GNOME/adwaita-icon-theme
|
||||
|
||||
License: LGPL-2.1-only
|
||||
This library is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
@@ -196,3 +217,40 @@ License: CC-BY-4.0
|
||||
The licence text above is a summary; the canonical legal text at the URL
|
||||
is what governs use, distribution and modification of the Licensed
|
||||
Material referenced under `Files: themes/default/icons/catalogue/*`.
|
||||
|
||||
License: CC-BY-SA-3.0
|
||||
Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0).
|
||||
.
|
||||
You are free to share and adapt the material for any purpose, even
|
||||
commercially, provided you give appropriate credit, provide a link to
|
||||
the licence, indicate if changes were made, and distribute your
|
||||
contributions under the same licence as the original (ShareAlike).
|
||||
.
|
||||
The canonical legal text is at:
|
||||
https://creativecommons.org/licenses/by-sa/3.0/legalcode
|
||||
.
|
||||
A human-readable summary (which is not a substitute for the licence) is
|
||||
available at:
|
||||
https://creativecommons.org/licenses/by-sa/3.0/
|
||||
.
|
||||
The summary above governs the Adwaita cursor files referenced under
|
||||
`Files: themes/default/cursors/*` when distributed under the 3.0 option.
|
||||
|
||||
License: CC-BY-SA-4.0
|
||||
Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0).
|
||||
.
|
||||
You are free to share and adapt the material for any purpose, even
|
||||
commercially, under the same Attribution and ShareAlike terms as the
|
||||
CC BY-SA 3.0 paragraph above.
|
||||
.
|
||||
The canonical legal text is at:
|
||||
https://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
.
|
||||
A human-readable summary (which is not a substitute for the licence) is
|
||||
available at:
|
||||
https://creativecommons.org/licenses/by-sa/4.0/
|
||||
|
||||
License: LGPL-3
|
||||
The Adwaita cursors are alternatively available under the GNU Lesser
|
||||
General Public License version 3. On Debian systems the complete text
|
||||
of the LGPL version 3 is in `/usr/share/common-licenses/LGPL-3`.
|
||||
|
||||
Reference in New Issue
Block a user