admin
58b8dd7b90
A scroll viewport keeps in `widget_rects` only the widgets at least partly inside its visible area (`draw/layout.rs`, the translation of the sub-canvas rects to surface space). A focus request whose target sits below the fold therefore never finds it: `App::take_focus_request` was honoured only for widgets already laid out on screen. The Wi-Fi page of settings is one such case by construction: tapping a secured network inserts the password form under the row and asks for focus on the field, so for a row in the lower part of the list the field is born outside the viewport and the request misses. Worse, the miss branch parked the id in `focus_retry`, marked the view dirty and requested a redraw on every iteration, so the application rebuilt and repainted at the compositor's frame rate for as long as the widget stayed hidden. The layout pass now records the widgets it drops for carrying a `WidgetId`: `DrawCtx::scroll_clipped` holds `(id, scroll flat_idx, rect)` with the rect in the scroll's content coordinates, the same frame the navigable-item list uses, and `draw_frame` hands it to `FrameState`. When a focus request misses, `AppData::reveal_clipped_widget` looks the id up in that list on the main surface and the overlays, finds the viewport in `scroll_rects`, and moves its offset on the axes the scroll allows so the rect lands inside; the next frame lays the widget out and the retry focuses it. Nested scrolls resolve one viewport per frame. The rule that computes the new offset is `scroll::offset_into_view`, extracted from the keyboard navigation in `input/keyboard/nav.rs`, which now calls it instead of carrying its own copy; unit tests cover the three cases. `focus_retry` carries a budget of drawn frames (`FOCUS_RETRY_FRAMES`, four), decremented only on iterations that actually drew, so a request made while a frame callback is pending does not lose its chance. A fresh request from the application replaces a pending retry with a full budget. When the budget runs out the request is dropped, which ends the redraw loop for a widget that never appears. Documented in the `take_focus_request` doc comment, the cookbook and the changelog; Debian revision 0.3.0-3.
60 lines
2.3 KiB
Rust
60 lines
2.3 KiB
Rust
// SPDX-License-Identifier: LGPL-2.1-only
|
|
// Copyright (C) 2026 Liberux Labs, S. L. <info@liberux.net>
|
|
|
|
use crate::app::App;
|
|
use crate::event_loop::{ AppData, SurfaceFocus };
|
|
use crate::widget::scroll::offset_into_view;
|
|
|
|
impl<A: App> AppData<A>
|
|
{
|
|
/// Step the topmost scroll's `hovered_idx` one item up or down with
|
|
/// the keyboard. Returns `true` when the move was applied (a scroll
|
|
/// with at least one navigable item was on screen and the new item
|
|
/// is different from the current hover) so the caller can fall
|
|
/// through to the application's own `on_key` only on a no-op.
|
|
///
|
|
/// The "topmost scroll" is the last entry in `scroll_rects`, which
|
|
/// matches Stack-overlay layout order: a popup pushed after the
|
|
/// main content sits above it. Auto-scrolls the new item into view
|
|
/// by adjusting `scroll_offsets[scroll_idx]`.
|
|
pub( crate ) fn move_keyboard_hover( &mut self, focus: SurfaceFocus, reverse: bool ) -> bool
|
|
{
|
|
// Find the topmost scroll that has a navigable item list.
|
|
let scroll_meta = {
|
|
let ss = self.surface( focus );
|
|
ss.frame.scroll_rects.iter().rev()
|
|
.find_map( |( rect, idx, _ax )|
|
|
{
|
|
ss.frame.scroll_navigable_items.get( idx )
|
|
.filter( |list| !list.is_empty() )
|
|
.map( |list| ( *rect, *idx, list.clone() ) )
|
|
} )
|
|
};
|
|
let Some( ( scroll_rect, scroll_idx, items ) ) = scroll_meta else { return false; };
|
|
|
|
let current = self.surface( focus ).hovered_idx;
|
|
let pos = current.and_then( |h| items.iter().position( |( i, _, _ )| *i == h ) );
|
|
let next_pos = match ( reverse, pos )
|
|
{
|
|
( false, None ) => 0,
|
|
( false, Some( p ) ) => ( p + 1 ).min( items.len() - 1 ),
|
|
( true, None ) => items.len() - 1,
|
|
( true, Some( p ) ) => p.saturating_sub( 1 ),
|
|
};
|
|
let ( new_idx, content_y, content_h ) = items[ next_pos ];
|
|
|
|
// Keyboard navigation only steps on the navigable-item axis (vertical
|
|
// list-style); the X offset is preserved as-is.
|
|
let ( current_x, current_y ) = self.surface( focus )
|
|
.frame.scroll_offsets.get( &scroll_idx )
|
|
.copied().unwrap_or( ( 0.0, 0.0 ) );
|
|
let new_y = offset_into_view( current_y, content_y, content_h, scroll_rect.height );
|
|
|
|
let ss = self.surface_mut( focus );
|
|
ss.hovered_idx = Some( new_idx );
|
|
ss.frame.scroll_offsets.insert( scroll_idx, ( current_x, new_y ) );
|
|
ss.request_redraw();
|
|
true
|
|
}
|
|
}
|