Documentation pass: every claim in docs/ and the meta files was audited against the source and the drift fixed — around ninety corrections. CONTRIBUTING and the CI workflow now run cargo test with --features test-support (the gated test_support module made both the documented commands and the CI build fail to compile), make example becomes make examples, make doctest-md and the debhelper requirement of make clean are documented, and patch shape asks for a CHANGELOG entry. theming.md loses the nonexistent surface.backdrop, gains the real gradient defaults (linear-rgb, oklab), the six slot variants including typography, the ten-field palette, a truthful effects-consumer table, the ThemePreference/from_hour API and a responsive-sizing note; the stale docstrings in src/theme that fed the drift are fixed too. architecture.md's "Known gaps" section is rewritten against reality (multi-touch slots, xdg-activation, a11y live regions and SetValue/Increment/Decrement are implemented), gains a module map, subsurfaces and window-lifecycle coverage, and correct crustace/loginmanager paths. widgets.md fixes the ten factual errors (stateless spinner, toast/combo via overlays(), tooltip hover contract, row has no max_width, scroll axes, multiline text_edit, dialog panic wording) and now states the column() 16 px default padding — the recurring ambush — plus row's differing 0 default and dialog's max_width. onboarding, README and cookbook get the remaining sweep: build/test instructions, complete example lists, img_widget, clipping-parity honesty, ~30 Hz software cap, read_rgba_pixels signature, tab indentation in snippets, and rustdoc-style links that rendered literally are gone everywhere. CHANGELOG is restructured per Keep a Changelog with the missing entries (window_resizable, claims_raw_touch, Row::align_top/fill_height, caret fixes, dependency pins) and the pad_v Added/Changed contradiction resolved. New adaptive-layout API: ltk::orientation() with the Orientation enum, backed by viewport_size()/set_viewport_size — the runtime records the main surface's physical dimensions on every configure, before App::on_resize, so view() can branch a layout on portrait vs landscape without hand-tracking resizes. The portrait rule matches Length::orient (square counts as portrait); embedders driving core::UiSurface call set_viewport_size themselves. Documented in the crate root's responsive-design section and architecture.md. Fluid-vs-fixed sizing fixes in widgets, all the same disease — fluid content inside a fixed-pixel box. TextEdit::fixed_width takes impl Into<Length> (f32 call sites keep compiling as px) and the time picker's digit fields move to Length::fluid( 72.0 ), matching their fluid font so digits can no longer outgrow the box. Dialog::max_width takes impl Into<Length> with a Length::fluid( 480.0 ) default so the card scales with the stock buttons inside it, and the card's interior no longer stacks the column() default 16 px padding on top of CARD_PADDING — that double inset squeezed the action row until its buttons clipped on narrow windows. App::on_pointer_axis now triggers a view rebuild and repaint; previously state mutated in the hook did not paint until the next unrelated event. Examples reworked to be honest demos: responsive's mode/density controls become stock buttons in a grid/column so they follow the modes they demonstrate instead of overflowing; dialog's openers stack vertically, and the example gains the app-level ESC handler so the ESC chain closes an open dialog first and quits second; widgets' tab strip now switches real per-tab pages; carousel gains pointer/touch drag through the horizontal-swipe hooks (crustace's pager pattern), one-tile-per-detent mouse wheel, and snap math driven by the real surface width from on_resize instead of a hardcoded 800; clip_path arranges its cells by ltk::orientation() and sizes them from the counter-axis of the flow.
124 lines
5.0 KiB
Rust
124 lines
5.0 KiB
Rust
// SPDX-License-Identifier: LGPL-2.1-only
|
|
// Copyright (C) 2026 Liberux Labs, S. L. <info@liberux.net>
|
|
|
|
//! The ten-slot semantic [`Palette`] every widget speaks in terms of, plus
|
|
//! the derived [`WindowControlsSpec`] fallback used when a theme document
|
|
//! omits the explicit `window_controls` block.
|
|
|
|
use crate::types::Color;
|
|
|
|
use super::prefs::WindowControlsSpec;
|
|
use super::slots::SlotStore;
|
|
|
|
// ─── Palette ─────────────────────────────────────────────────────────────────
|
|
|
|
/// Semantic colour tokens shared by every widget.
|
|
#[ derive( Debug, Clone, Copy ) ]
|
|
pub struct Palette
|
|
{
|
|
/// Page / wallpaper background when no image is present.
|
|
pub bg: Color,
|
|
/// Floating surface over the wallpaper (cards, panels, dock) — usually translucent.
|
|
pub surface: Color,
|
|
/// Elevated surface (hovered card, pressed toggle, inner pill).
|
|
pub surface_alt: Color,
|
|
/// Primary foreground text.
|
|
pub text_primary: Color,
|
|
/// Subdued text (date strip, helper text, disabled labels).
|
|
pub text_secondary: Color,
|
|
/// Brand accent used for active toggles, sliders, focus rings.
|
|
pub accent: Color,
|
|
/// Thin separators and low-contrast borders.
|
|
pub divider: Color,
|
|
/// Tint for symbolic icons (wifi / battery / search / etc).
|
|
pub icon: Color,
|
|
/// Foreground colour for destructive / error states — text in
|
|
/// "delete" buttons, error helper rows under invalid inputs,
|
|
/// the border of an errored pill.
|
|
pub danger: Color,
|
|
/// Soft fill behind error states. Pairs with `danger` as
|
|
/// foreground; light enough that body text remains legible on
|
|
/// top.
|
|
pub danger_bg: Color,
|
|
}
|
|
|
|
// ─── Palette projection ──────────────────────────────────────────────────────
|
|
|
|
impl Palette
|
|
{
|
|
/// Project a [`SlotStore`] onto the ten canonical palette fields.
|
|
/// Slot ids are the ones declared in the default theme JSON
|
|
/// (`bg-page`, `surface`, `surface-alt`, `text-primary`,
|
|
/// `text-secondary`, `accent`, `divider`, `icon`, `danger`,
|
|
/// `danger-bg`). Missing slots
|
|
/// fall back to a documented sensible default so downstream widgets
|
|
/// never see uninitialised colours. Used by [`crate::theme::palette()`] and
|
|
/// [`crate::theme::window_controls`].
|
|
pub fn from_slots( slots: &SlotStore ) -> Self
|
|
{
|
|
Self
|
|
{
|
|
bg: slots.color( "bg-page" ).unwrap_or( Color::WHITE ),
|
|
surface: slots.color( "surface" ).unwrap_or( Color::WHITE ),
|
|
surface_alt: slots.color( "surface-alt" ).unwrap_or( Color::WHITE ),
|
|
text_primary: slots.color( "text-primary" ).unwrap_or( Color::BLACK ),
|
|
text_secondary: slots.color( "text-secondary" ).unwrap_or( Color::rgba( 0.0, 0.0, 0.0, 0.6 ) ),
|
|
accent: slots.color( "accent" ).unwrap_or( Color::hex( 0x00, 0xCE, 0xB1 ) ),
|
|
divider: slots.color( "divider" ).unwrap_or( Color::rgba( 0.0, 0.0, 0.0, 0.08 ) ),
|
|
icon: slots.color( "icon" ).unwrap_or( Color::BLACK ),
|
|
// Conservative defaults: a rich red for fg, a tinted
|
|
// pink wash for bg. Themes can override via the
|
|
// `danger` / `danger-bg` slot ids.
|
|
danger: slots.color( "danger" ).unwrap_or( Color::hex( 0xA8, 0x00, 0x10 ) ),
|
|
danger_bg: slots.color( "danger-bg" ).unwrap_or( Color::rgba( 1.0, 0.85, 0.88, 1.0 ) ),
|
|
}
|
|
}
|
|
}
|
|
|
|
// ─── Shared helpers ──────────────────────────────────────────────────────────
|
|
|
|
/// Derive a sensible [`WindowControlsSpec`] from a [`Palette`] when the
|
|
/// theme document omits the `window_controls` block. Also used by the
|
|
/// JSON loader in `schema.rs` when individual overrides are absent.
|
|
pub ( crate ) fn default_window_controls( palette: Palette ) -> WindowControlsSpec
|
|
{
|
|
WindowControlsSpec
|
|
{
|
|
bar_bg: Color { a: 1.0, ..palette.surface },
|
|
icon: palette.icon,
|
|
hover_bg: palette.surface_alt,
|
|
pressed_bg: palette.divider,
|
|
close_hover_bg: Color::rgba( 0.92, 0.18, 0.18, 0.90 ),
|
|
close_icon: Color::WHITE,
|
|
focus_ring: palette.accent,
|
|
}
|
|
}
|
|
|
|
#[ cfg( test ) ]
|
|
mod tests
|
|
{
|
|
use super::*;
|
|
use super::super::slots::{ self, Metadata, Slot };
|
|
|
|
#[ test ]
|
|
fn palette_from_slots_uses_canonical_ids()
|
|
{
|
|
let mut store = slots::SlotStore::new();
|
|
store.insert
|
|
(
|
|
"bg-page",
|
|
Slot::Color { value: Color::hex( 0x01, 0x02, 0x03 ), meta: Metadata::default() },
|
|
);
|
|
store.insert
|
|
(
|
|
"text-primary",
|
|
Slot::Color { value: Color::hex( 0xF0, 0xF1, 0xF2 ), meta: Metadata::default() },
|
|
);
|
|
let p = Palette::from_slots( &store );
|
|
assert_eq!( p.bg, Color::hex( 0x01, 0x02, 0x03 ) );
|
|
assert_eq!( p.text_primary, Color::hex( 0xF0, 0xF1, 0xF2 ) );
|
|
// Missing slots fall back to documented sensible defaults.
|
|
assert_eq!( p.icon, Color::BLACK );
|
|
}
|
|
}
|