system settings
git clone https://git.lucas.co/cce-system-interface.git
chore: use the toolkit ScrollRegion, delete the local copy
This crate's copy was where the intersection fix (partial rows
returned, drawn under the pages' push_clip_rect) originated; the
toolkit's cce_ui::widget::ScrollRegion (cce-ui@764d9e7) is that same
fixed version lifted verbatim, so this is a pure de-duplication — no
behavior change. lib.rs re-exports the toolkit module for the pages.
Co-Authored-By: Claude Fable 5 <[email protected]>
src/lib.rs | 2 +-
src/pages/accounts.rs | 2 +-
src/pages/network.rs | 2 +-
src/pages/packages.rs | 2 +-
src/pages/processes.rs | 2 +-
src/pages/services.rs | 2 +-
src/pages/timers.rs | 2 +-
src/scroll_region.rs | 512 -------------------------------------------------
8 files changed, 7 insertions(+), 519 deletions(-)
diff --git a/src/lib.rs b/src/lib.rs
index 72d10f0..1e188a8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,5 @@
pub mod app;
pub mod pages;
-pub mod scroll_region;
+pub use cce_ui::widget::scroll_region;
pub mod widgets;
pub mod watchers;
diff --git a/src/pages/accounts.rs b/src/pages/accounts.rs
index cc15d9b..a979c83 100644
--- a/src/pages/accounts.rs
+++ b/src/pages/accounts.rs
@@ -1,6 +1,6 @@
use crate::app::{AppAction, PageContent, SectionContextExt, section_divider, section_kv_row};
use cce_ui::layout::{PageLayoutBuilder, LayoutStrategy, RenderTarget};
-use crate::scroll_region::ScrollRegion;
+use cce_ui::widget::ScrollRegion;
use cce_ui::widget::{TextBox, WidgetHost};
/// Secret Service entries are keyed by (service, address) — the same pair
diff --git a/src/pages/network.rs b/src/pages/network.rs
index db68eb8..4191b18 100644
--- a/src/pages/network.rs
+++ b/src/pages/network.rs
@@ -1,5 +1,5 @@
use crate::app::{AppAction, PageContent};
-use crate::scroll_region::ScrollRegion;
+use cce_ui::widget::ScrollRegion;
use cce_ui::layout::{PageLayoutBuilder, LayoutStrategy, RenderTarget};
use cce_ui::widget::{Adapted, Toggle};
diff --git a/src/pages/packages.rs b/src/pages/packages.rs
index 478022a..e07ec6e 100644
--- a/src/pages/packages.rs
+++ b/src/pages/packages.rs
@@ -1,5 +1,5 @@
use crate::app::{AppAction, PageContent, SectionContextExt, section_divider};
-use crate::scroll_region::ScrollRegion;
+use cce_ui::widget::ScrollRegion;
use cce_ui::layout::{render_widget, PageLayoutBuilder, LayoutStrategy, SectionContext, RenderTarget};
use cce_ui::widget::{WidgetHost, TextBox, InteractiveListItem};
diff --git a/src/pages/processes.rs b/src/pages/processes.rs
index e54c94d..8168ccc 100644
--- a/src/pages/processes.rs
+++ b/src/pages/processes.rs
@@ -1,5 +1,5 @@
use crate::app::{AppAction, PageContent};
-use crate::scroll_region::ScrollRegion;
+use cce_ui::widget::ScrollRegion;
use cce_ui::layout::{PageLayoutBuilder, LayoutStrategy, RenderTarget};
#[derive(Debug, Clone)]
diff --git a/src/pages/services.rs b/src/pages/services.rs
index 8e32c4d..9293f50 100644
--- a/src/pages/services.rs
+++ b/src/pages/services.rs
@@ -1,5 +1,5 @@
use crate::app::{PageContent, SectionContextExt};
-use crate::scroll_region::ScrollRegion;
+use cce_ui::widget::ScrollRegion;
use cce_ui::layout::{render_widget, PageLayoutBuilder, LayoutStrategy, RenderTarget};
use cce_ui::widget::{TextBox, InteractiveListItem, WidgetHost};
diff --git a/src/pages/timers.rs b/src/pages/timers.rs
index adbb8e3..b0b4803 100644
--- a/src/pages/timers.rs
+++ b/src/pages/timers.rs
@@ -3,7 +3,7 @@
//! timer units (system scope through pkexec).
use crate::app::{PageContent, SectionContextExt};
-use crate::scroll_region::ScrollRegion;
+use cce_ui::widget::ScrollRegion;
use cce_ui::layout::{render_widget, PageLayoutBuilder, LayoutStrategy, RenderTarget};
use cce_ui::widget::{StatusDot, DotStatus, InteractiveListItem, TextBox, WidgetHost};
diff --git a/src/scroll_region.rs b/src/scroll_region.rs
deleted file mode 100644
index 512cffa..0000000
--- a/src/scroll_region.rs
+++ /dev/null
@@ -1,512 +0,0 @@
-//! App-owned scroll region replacing the dissolved `ScrollBox` / `List` embedded bases
-//! (ported from cce-fonts' Phase 6q dissolution). Every settings list was a pure scroll
-//! frame (`List` with `columns: None`) — the rows are drawn by the pages themselves — so
-//! the widgets contributed only: the rounded border + background, the scrollbar, the
-//! scroll state/virtualization math, and wheel/drag/keyboard input. All replicated here.
-//!
-//! One deliberate visual fix over the legacy pipeline: `List::extra_quads` skipped its
-//! bg-removal for `columns: None` lists, so `render_widget` emitted border+bg TWICE (the
-//! plain bg quad through the solid-border branch, then `all_rounded_quads` again) with
-//! the scrollbar sandwiched between the two translucent bg layers — the same
-//! double-composite class Phase 6p found on Plates. The dissolved region draws
-//! border, bg, track, thumb once, in that order.
-
-use cce_ui::widget::{ElementState, Key, KeyEvent, MouseScrollDelta, NamedKey};
-
-#[derive(Debug, Clone)]
-pub struct ScrollRegion {
- pub x: f32,
- pub y: f32,
- pub w: f32,
- pub h: f32,
- /// Row height, with `List::new`'s silent adjustment to `max(item_height, list_font + 14)`.
- pub item_height: f32,
- pub item_gap: f32,
- pub scroll_y: f32,
- pub content_h: f32,
- pub viewport_y: f32,
- pub viewport_h: f32,
- /// Horizontal scrolling is opt-in per list: it activates only when a page
- /// declares a content width wider than the box (`set_content_w`). The
- /// default 0 keeps every existing vertical-only list exactly as it was.
- pub scroll_x: f32,
- pub content_w: f32,
- pub dragging: bool,
- dragging_h: bool,
- drag_offset_y: f32,
- drag_offset_x: f32,
- pub hovered: bool,
- /// Local stand-in for the legacy global focus flag (`ScrollBox::focus()` on any press
- /// inside the frame): set on a press that hits the region, cleared on one that misses.
- pub focused: bool,
- /// Draw the border + background plate in `push_prims`. Off = frameless: rows
- /// sit directly on the window plate (the scrollbar still draws).
- pub draw_frame: bool,
-}
-
-impl Default for ScrollRegion {
- /// A region with no geometry yet — `set_rect`/`update_bounds` supply that on
- /// the first view pass. `new(0.0, ..)` floors `item_height` at the list
- /// font's line box, so a host that forgets to size its rows still gets a
- /// legible one rather than a zero-height row that never draws.
- fn default() -> Self {
- Self::new(0.0, 4.0)
- }
-}
-
-impl ScrollRegion {
- pub fn new(item_height: f32, item_gap: f32) -> Self {
- let (_, font_size) = cce_ui::layout::list_font_parsed();
- Self {
- x: 0.0,
- y: 0.0,
- w: 0.0,
- h: 0.0,
- item_height: item_height.max(font_size + 14.0),
- item_gap,
- scroll_y: 0.0,
- content_h: 0.0,
- viewport_y: 0.0,
- viewport_h: 0.0,
- scroll_x: 0.0,
- content_w: 0.0,
- dragging: false,
- dragging_h: false,
- drag_offset_y: 0.0,
- drag_offset_x: 0.0,
- hovered: false,
- focused: false,
- draw_frame: true,
- }
- }
-
- pub fn with_frame(mut self, draw_frame: bool) -> Self {
- self.draw_frame = draw_frame;
- self
- }
-
- pub fn set_rect(&mut self, x: f32, y: f32, w: f32, h: f32) {
- self.x = x;
- self.y = y;
- self.w = w;
- self.h = h;
- }
-
- /// The `List::update_bounds` count math: `content_h = count * (item_height + gap) + 4`.
- pub fn update_bounds(&mut self, count: usize, viewport_y: f32, viewport_h: f32) {
- self.content_h = count as f32 * (self.item_height + self.item_gap) + 4.0;
- self.viewport_y = viewport_y;
- self.viewport_h = viewport_h;
- self.scroll_y = self.scroll_y.clamp(0.0, self.max_scroll());
- }
-
- pub fn set_scroll_y(&mut self, val: f32) {
- self.scroll_y = val;
- }
-
- /// Declare how wide the content really is. Wider than the box = the list
- /// scrolls horizontally (bottom scrollbar, x wheel deltas, arrow keys).
- pub fn set_content_w(&mut self, w: f32) {
- self.content_w = w;
- self.scroll_x = self.scroll_x.clamp(0.0, self.max_scroll_x());
- }
-
- /// Whether horizontal scrolling is live (content declared wider than the
- /// box). Pages use this to reserve bottom room for the h-bar.
- pub fn h_scroll_active(&self) -> bool {
- self.content_w > self.w
- }
-
- fn max_scroll(&self) -> f32 {
- (self.content_h - self.viewport_h).max(0.0)
- }
-
- fn max_scroll_x(&self) -> f32 {
- (self.content_w - self.w).max(0.0)
- }
-
- pub fn hit(&self, px: f32, py: f32) -> bool {
- px >= self.x && px < self.x + self.w && py >= self.y && py < self.y + self.h
- }
-
- /// Row virtualization (`List::get_item_draw_y`): screen y for row `idx`, or `None`
- /// when the row doesn't intersect the viewport at all. Partially visible rows
- /// ARE returned — callers draw under a clip rect, so they render cut, not culled.
- pub fn get_item_draw_y(&self, idx: usize, offset: f32) -> Option<f32> {
- let virtual_y = idx as f32 * (self.item_height + self.item_gap) + offset;
- let draw_y = self.viewport_y + virtual_y - self.scroll_y;
- if draw_y + self.item_height >= self.viewport_y - 1.0
- && draw_y <= self.viewport_y + self.viewport_h + 1.0
- {
- Some(draw_y)
- } else {
- None
- }
- }
-
- /// Scrollbar geometry (`ScrollBox::extra_quads`): (sb_x, track_y, sb_w, track_h, thumb_y, thumb_h).
- fn scrollbar_geom(&self) -> (f32, f32, f32, f32, f32, f32) {
- let sb_w = cce_ui::layout::scrollbar_width();
- let sb_x = self.x + self.w - sb_w - 4.0;
- let track_h = self.viewport_h - 8.0;
- let track_y = self.viewport_y + 4.0;
- let visible_ratio = self.viewport_h / self.content_h.max(1.0);
- let thumb_h = if track_h <= 20.0 {
- track_h
- } else {
- (track_h * visible_ratio).clamp(20.0, track_h)
- };
- let scroll_ratio = if self.max_scroll() > 0.0 { self.scroll_y / self.max_scroll() } else { 0.0 };
- let thumb_y = track_y + scroll_ratio * (track_h - thumb_h);
- (sb_x, track_y, sb_w, track_h, thumb_y, thumb_h)
- }
-
- fn hit_scrollbar(&self, px: f32, py: f32) -> bool {
- if self.content_h <= self.viewport_h {
- return false;
- }
- let (sb_x, track_y, sb_w, track_h, _, _) = self.scrollbar_geom();
- px >= sb_x - 4.0 && px <= sb_x + sb_w + 4.0 && py >= track_y && py <= track_y + track_h
- }
-
- /// Bottom scrollbar geometry, mirroring [`Self::scrollbar_geom`] with the
- /// axes swapped: (track_x, sb_y, track_w, sb_h, thumb_x, thumb_w). The
- /// track stops short of the vertical bar's strip so the pills never
- /// overlap in the corner.
- fn h_scrollbar_geom(&self) -> (f32, f32, f32, f32, f32, f32) {
- let sb_h = cce_ui::layout::scrollbar_width();
- let sb_y = self.y + self.h - sb_h - 4.0;
- let right_reserve = if self.content_h > self.viewport_h { sb_h + 8.0 } else { 0.0 };
- let track_x = self.x + 4.0;
- let track_w = self.w - 8.0 - right_reserve;
- let visible_ratio = self.w / self.content_w.max(1.0);
- let thumb_w = if track_w <= 20.0 {
- track_w
- } else {
- (track_w * visible_ratio).clamp(20.0, track_w)
- };
- let ratio = if self.max_scroll_x() > 0.0 { self.scroll_x / self.max_scroll_x() } else { 0.0 };
- let thumb_x = track_x + ratio * (track_w - thumb_w);
- (track_x, sb_y, track_w, sb_h, thumb_x, thumb_w)
- }
-
- fn hit_h_scrollbar(&self, px: f32, py: f32) -> bool {
- if !self.h_scroll_active() {
- return false;
- }
- let (track_x, sb_y, track_w, sb_h, _, _) = self.h_scrollbar_geom();
- py >= sb_y - 4.0 && py <= sb_y + sb_h + 4.0 && px >= track_x && px <= track_x + track_w
- }
-
- /// Left press: scrollbar thumb grab or track jump (`ScrollBox::mouse_input`), plus the
- /// press-inside focus / press-outside unfocus bookkeeping. Returns true only when the
- /// scrollbar consumed the press — a press on the rows falls through to them.
- pub fn press(&mut self, px: f32, py: f32) -> bool {
- self.focused = self.hit(px, py);
- // The bottom bar first: its ±4 slop strip sits inside the box, where
- // the vertical hit test can never claim it.
- if self.hit_h_scrollbar(px, py) {
- self.dragging_h = true;
- let (track_x, _, track_w, _, thumb_x, thumb_w) = self.h_scrollbar_geom();
- let click_offset = px - thumb_x;
- if click_offset >= 0.0 && click_offset <= thumb_w {
- self.drag_offset_x = click_offset;
- } else {
- self.drag_offset_x = thumb_w / 2.0;
- let target = px - self.drag_offset_x;
- let ratio = if track_w - thumb_w > 0.0 {
- ((target - track_x) / (track_w - thumb_w)).clamp(0.0, 1.0)
- } else {
- 0.0
- };
- self.scroll_x = ratio * self.max_scroll_x();
- }
- return true;
- }
- if !self.hit_scrollbar(px, py) {
- self.dragging = false;
- return false;
- }
- self.dragging = true;
- let (_, track_y, _, track_h, thumb_y, thumb_h) = self.scrollbar_geom();
- let click_offset = py - thumb_y;
- if click_offset >= 0.0 && click_offset <= thumb_h {
- self.drag_offset_y = click_offset;
- } else {
- self.drag_offset_y = thumb_h / 2.0;
- let target = py - self.drag_offset_y;
- let ratio = if track_h - thumb_h > 0.0 {
- ((target - track_y) / (track_h - thumb_h)).clamp(0.0, 1.0)
- } else {
- 0.0
- };
- self.scroll_y = ratio * self.max_scroll();
- }
- true
- }
-
- /// Returns whether a thumb drag was in progress (the caller's redraw signal).
- pub fn release(&mut self) -> bool {
- // Bitwise on purpose: both drags must reset even when the first
- // operand is already true (|| would short-circuit the take).
- std::mem::take(&mut self.dragging) | std::mem::take(&mut self.dragging_h)
- }
-
- fn drag_move(&mut self, py: f32) -> bool {
- let (_, track_y, _, track_h, _, thumb_h) = self.scrollbar_geom();
- let target = py - self.drag_offset_y;
- let ratio = if track_h - thumb_h > 0.0 {
- ((target - track_y) / (track_h - thumb_h)).clamp(0.0, 1.0)
- } else {
- 0.0
- };
- let old = self.scroll_y;
- self.scroll_y = ratio * self.max_scroll();
- (self.scroll_y - old).abs() > 0.01
- }
-
- /// Pointer-move bookkeeping: forwards to an active thumb drag (returns true so the host
- /// treats it as a high-priority drag override), else just tracks hover for the border
- /// tint and the keyboard scope.
- pub fn cursor_moved(&mut self, px: f32, py: f32) -> bool {
- self.hovered = self.hit(px, py);
- if self.dragging {
- self.drag_move(py);
- return true;
- }
- if self.dragging_h {
- let (track_x, _, track_w, _, _, thumb_w) = self.h_scrollbar_geom();
- let target = px - self.drag_offset_x;
- let ratio = if track_w - thumb_w > 0.0 {
- ((target - track_x) / (track_w - thumb_w)).clamp(0.0, 1.0)
- } else {
- 0.0
- };
- self.scroll_x = ratio * self.max_scroll_x();
- return true;
- }
- false
- }
-
- pub fn wheel(&mut self, delta: &MouseScrollDelta, px: f32, py: f32) -> bool {
- if !self.hit(px, py) {
- return false;
- }
- let (dx, dy) = match delta {
- MouseScrollDelta::LineDelta(x, y) => (-x * 24.0, -y * 24.0),
- MouseScrollDelta::PixelDelta(pos) => (-pos.x as f32, -pos.y as f32),
- };
- let old_y = self.scroll_y;
- self.scroll_y = (self.scroll_y + dy).clamp(0.0, self.max_scroll());
- // Sideways wheel/trackpad deltas pan an h-scrollable list; a
- // vertical-only list ignores them (max_scroll_x = 0 clamps to 0).
- let old_x = self.scroll_x;
- self.scroll_x = (self.scroll_x + dx).clamp(0.0, self.max_scroll_x());
- (self.scroll_y - old_y).abs() > 0.01 || (self.scroll_x - old_x).abs() > 0.01
- }
-
- /// Hover/focus-scoped keyboard scrolling (`ScrollBox::keyboard_input` reached the boxes
- /// when focused or hovered; the dissolved region keeps both via its local flags).
- pub fn keyboard(&mut self, event: &KeyEvent) -> bool {
- if (!self.hovered && !self.focused) || event.state != ElementState::Pressed {
- return false;
- }
- let max = self.max_scroll();
- let old = self.scroll_y;
- if event.ctrl {
- match &event.logical_key {
- Key::Character(c) if c == "n" || c == "N" => self.scroll_y = (self.scroll_y + 24.0).clamp(0.0, max),
- Key::Character(c) if c == "p" || c == "P" => self.scroll_y = (self.scroll_y - 24.0).clamp(0.0, max),
- _ => return false,
- }
- } else {
- let old_x = self.scroll_x;
- let max_x = self.max_scroll_x();
- match &event.logical_key {
- Key::Named(NamedKey::ArrowDown) => self.scroll_y = (self.scroll_y + 24.0).clamp(0.0, max),
- Key::Named(NamedKey::ArrowUp) => self.scroll_y = (self.scroll_y - 24.0).clamp(0.0, max),
- Key::Named(NamedKey::PageDown) => self.scroll_y = (self.scroll_y + self.viewport_h).clamp(0.0, max),
- Key::Named(NamedKey::PageUp) => self.scroll_y = (self.scroll_y - self.viewport_h).clamp(0.0, max),
- Key::Named(NamedKey::Home) => self.scroll_y = 0.0,
- Key::Named(NamedKey::End) => self.scroll_y = max,
- // Only an h-scrollable list claims the horizontal arrows —
- // elsewhere they keep falling through to other handlers.
- Key::Named(NamedKey::ArrowRight) if max_x > 0.0 => {
- self.scroll_x = (self.scroll_x + 24.0).clamp(0.0, max_x)
- }
- Key::Named(NamedKey::ArrowLeft) if max_x > 0.0 => {
- self.scroll_x = (self.scroll_x - 24.0).clamp(0.0, max_x)
- }
- _ => return false,
- }
- if (self.scroll_x - old_x).abs() > 0.01 {
- return true;
- }
- }
- (self.scroll_y - old).abs() > 0.01
- }
-
- /// The legacy frame, single-drawn: 1px rounded border (focus/hover tinted, from
- /// `List::solid_border`), inset rounded bg, then the scrollbar track and thumb ON TOP.
- pub fn push_prims(&self, pc: &mut dyn cce_ui::layout::RenderTarget) {
- if self.draw_frame {
- let radius = cce_ui::layout::list_corner_radius();
- let border_color = if self.focused {
- [0.30, 0.50, 0.32, 1.0]
- } else if self.hovered {
- [0.25, 0.25, 0.35, 1.0]
- } else {
- [0.18, 0.18, 0.24, 1.0]
- };
- let all = (true, true, true, true);
- pc.rect_with_radius_corners(border_color, self.x, self.y, self.w, self.h, radius, all);
- pc.rect_with_radius_corners(
- cce_ui::color::list_bg_color(),
- self.x + 1.0,
- self.y + 1.0,
- self.w - 2.0,
- self.h - 2.0,
- (radius - 1.0).max(0.0),
- all,
- );
- }
- if self.content_h > self.viewport_h {
- // Track and thumb are pills — half-width radius (the designer look).
- let (sb_x, track_y, sb_w, track_h, thumb_y, thumb_h) = self.scrollbar_geom();
- let all = (true, true, true, true);
- pc.rect_with_radius_corners(cce_ui::color::scrollbar_track_color(), sb_x, track_y, sb_w, track_h, sb_w.min(track_h) * 0.5, all);
- pc.rect_with_radius_corners(cce_ui::color::scrollbar_thumb_color(), sb_x, thumb_y, sb_w, thumb_h, sb_w.min(thumb_h) * 0.5, all);
- }
- if self.h_scroll_active() {
- let (track_x, sb_y, track_w, sb_h, thumb_x, thumb_w) = self.h_scrollbar_geom();
- let all = (true, true, true, true);
- pc.rect_with_radius_corners(cce_ui::color::scrollbar_track_color(), track_x, sb_y, track_w, sb_h, sb_h.min(track_w) * 0.5, all);
- pc.rect_with_radius_corners(cce_ui::color::scrollbar_thumb_color(), thumb_x, sb_y, thumb_w, sb_h, sb_h.min(thumb_w) * 0.5, all);
- }
- }
-}
-
-#[cfg(test)]
-mod tests {
- use super::*;
-
- fn region() -> ScrollRegion {
- // item_height clamps to list_font + 14, so pick one comfortably above any config.
- let mut r = ScrollRegion::new(40.0, 4.0);
- r.set_rect(10.0, 20.0, 200.0, 100.0);
- r
- }
-
- #[test]
- fn wheel_scrolls_and_clamps() {
- let mut r = region();
- r.update_bounds(10, 20.0, 100.0); // content_h = 444 > 100
- assert!(r.wheel(&MouseScrollDelta::LineDelta(0.0, -2.0), 50.0, 50.0));
- assert_eq!(r.scroll_y, 48.0);
- assert!(!r.wheel(&MouseScrollDelta::LineDelta(0.0, -2.0), 500.0, 50.0)); // miss
- r.wheel(&MouseScrollDelta::LineDelta(0.0, -100.0), 50.0, 50.0);
- assert_eq!(r.scroll_y, 344.0); // clamped to max_scroll
- }
-
- #[test]
- fn virtualization_matches_list_math() {
- let mut r = region();
- r.update_bounds(10, 20.0, 100.0);
- r.set_scroll_y(0.0);
- // Row 0 at viewport_y + 0*(44) + 4 = 24; fits (24 + 40 <= 121).
- assert_eq!(r.get_item_draw_y(0, 4.0), Some(24.0));
- // Row 2 at 20 + 92 - 0 = 112: extends past the viewport bottom (121) but
- // still intersects it — returned so the caller draws it cut by the clip.
- assert_eq!(r.get_item_draw_y(2, 4.0), Some(112.0));
- // Row 3 at 20 + 136 = 156: fully below the viewport → culled.
- assert!(r.get_item_draw_y(3, 4.0).is_none());
- }
-
- #[test]
- fn virtualization_keeps_partial_row_at_top() {
- let mut r = region();
- r.update_bounds(10, 20.0, 100.0);
- // Scrolled so row 0 (virtual 4..44) is half above the viewport top:
- // draw_y = 20 + 4 - 24 = 0 < viewport_y, but its bottom (40) intersects.
- r.set_scroll_y(24.0);
- assert_eq!(r.get_item_draw_y(0, 4.0), Some(0.0));
- // A row whose bottom ends above the viewport top would be culled; with
- // this geometry row 0 always intersects, so scroll far and check row 0.
- r.set_scroll_y(80.0);
- assert!(r.get_item_draw_y(0, 4.0).is_none());
- }
-
- #[test]
- fn press_focuses_and_grabs_only_scrollbar() {
- let mut r = region();
- r.update_bounds(10, 20.0, 100.0);
- // Press in the rows area: focused, not dragging, falls through.
- assert!(!r.press(50.0, 50.0));
- assert!(r.focused && !r.dragging);
- // Press on the scrollbar strip (x + w - sb_w - 4 ± 4): consumed.
- let sb_x = 10.0 + 200.0 - cce_ui::layout::scrollbar_width() - 4.0;
- assert!(r.press(sb_x + 1.0, 50.0));
- assert!(r.dragging);
- assert!(r.release());
- // Press outside: unfocuses.
- assert!(!r.press(500.0, 500.0));
- assert!(!r.focused);
- }
-
- #[test]
- fn horizontal_scroll_is_opt_in_and_clamps() {
- let mut r = region();
- r.update_bounds(10, 20.0, 100.0);
- // No content width declared: x wheel deltas change nothing and the
- // vertical-only behavior (including the y component) is untouched.
- assert!(!r.wheel(&MouseScrollDelta::LineDelta(-2.0, 0.0), 50.0, 50.0));
- assert_eq!(r.scroll_x, 0.0);
- assert!(!r.h_scroll_active());
-
- // Content wider than the 200px box: x deltas pan and clamp.
- r.set_content_w(500.0);
- assert!(r.h_scroll_active());
- assert!(r.wheel(&MouseScrollDelta::LineDelta(-2.0, 0.0), 50.0, 50.0));
- assert_eq!(r.scroll_x, 48.0);
- r.wheel(&MouseScrollDelta::LineDelta(-100.0, 0.0), 50.0, 50.0);
- assert_eq!(r.scroll_x, 300.0); // max = 500 - 200
- r.wheel(&MouseScrollDelta::LineDelta(100.0, 0.0), 50.0, 50.0);
- assert_eq!(r.scroll_x, 0.0);
- }
-
- #[test]
- fn h_thumb_press_grabs_and_releases() {
- let mut r = region();
- r.update_bounds(2, 20.0, 100.0); // no vertical overflow
- r.set_content_w(500.0);
- // The bottom strip: y + h - sb_w - 4, thumb starts at track_x.
- let sb_y = 20.0 + 100.0 - cce_ui::layout::scrollbar_width() - 4.0;
- assert!(r.press(20.0, sb_y + 1.0));
- // Drag right: scroll_x follows.
- assert!(r.cursor_moved(120.0, sb_y + 1.0));
- assert!(r.scroll_x > 0.0);
- assert!(r.release());
- // A rows-area press still falls through (no h-bar hit).
- assert!(!r.press(50.0, 50.0));
- }
-
- #[test]
- fn keyboard_is_hover_or_focus_scoped() {
- let mut r = region();
- r.update_bounds(10, 20.0, 100.0);
- let down = KeyEvent {
- state: ElementState::Pressed,
- logical_key: Key::Named(NamedKey::ArrowDown),
- text: None,
- repeat: false,
- ctrl: false,
- shift: false,
- alt: false,
- };
- assert!(!r.keyboard(&down)); // neither hovered nor focused
- r.cursor_moved(50.0, 50.0);
- assert!(r.hovered);
- assert!(r.keyboard(&down));
- assert_eq!(r.scroll_y, 24.0);
- }
-}