复审 P1-1(产品页丢窗口装饰):shell 加内容槽位 view_with_content(ui, nav, title, content, forced),
app/view.rs 把 pages::page(...) 塞进真外壳;shell::view 保留给 Route::Agent 回落(删了会让私有
view/nav::rail 变死代码,-D warnings 红)。content() 拆到 shell/fallback.rs 让 mod.rs 回到 365 行。
1180 浅/深新图右上角三个 caption 键实测:ink 中心 y=23.5(栏高 48 的一半)、x 中心 1064.5/1110.5/
1156.5 = 46px 分档的 1065/1111/1157(±0.5px),close 命中区右缘 = 1180 窗角。
偏离 #7 改写成「交互面缺失」并注明本轮已修。
P1-2(harness.rs 402 行):tests 外置到 pages/harness/tests.rs(343 + 64 行);
components/gate.rs 的行数守门从走查 components/ 扩到 src/**(新测试当场抓出 app/tests.rs 416 行,
已按同样办法拆成 app/tests.rs + app/tests/presenter.rs)。
P2-1(常驻重绘 + 每拍重建模型):subscription 只在「截图 / 有 Busy-Running / 有 toast / 3 s 派发
观察窗」时订阅 window::frames();refresh_view 加 view_dirty 门。实测交互模式 9 s:只有 2 行 tick
trace(n=30/60,观察窗内),之后 6.5 s 一条都没有;refreshes 全程停在 7。
P2-2(两个数据根):--data-dir 时 SettingsBridge::with_path(config_path(root)),与后端同根。
P3-2(假绿):新增 RecorderBackend(dispatch 只记账、drain_events 恒空)+ launching_only_dispatches
_and_never_echoes_locally;植入本地回显后该测试实测转红(status 变 Downloading · 0%、can_stop 翻
true),撤回后转绿。
P3-3:尺寸字面量守门目录加 app;P3-1:--force-state 经 pages::Model::forced 作用到产品页控件
(hover 图里页头/列表/动作行/rail/caption 全部可见状态层);视觉 P2-2:加载器名统一走 badge()。
gallery 回归改口径:r2 与「主线 + r1」的 gallery 逐字节相同(cmp IDENTICAL);与 r1 记的
c825e1a 基线不同,差异来自主线 M86/M88 的令牌收口,不是本 mission。
226 lines
7.9 KiB
Rust
226 lines
7.9 KiB
Rust
//! 实例页:**list-detail** 的唯一用例,也是 M90 唯一打通到「真组件 + 真数据 + 真命令」的页。
|
||
//!
|
||
//! ## 版式(由 [`super::layout`] 决议,页面不自己算宽度)
|
||
//!
|
||
//! | 版面 | 结构 | 退化行为 |
|
||
//! |---|---|---|
|
||
//! | `ListDetail`(窗口 ≥840) | 左列 336 固定、**独立滚动**;右列详情,正文列 ≤424 | — |
|
||
//! | `SingleColumn`(<840) | 列表与详情**整页切换**:本页只渲染详情列(≤424,居中) | 顶部给「Back to instances」,列表退成上一屏 |
|
||
//!
|
||
//! 为什么窄窗不是「上下堆」:官方 compact 下 list-detail 的口径是一次只显示一个 pane(列表 → 详情,
|
||
//! 整页切换)。上下堆会把详情挤到折叠线以下,等于详情不存在。
|
||
//!
|
||
//! ## M90:占位控件 → 真组件(逐项对照)
|
||
//!
|
||
//! | 位置 | M84(占位) | M90(真组件) |
|
||
//! |---|---|---|
|
||
//! | 列表行 | 手搓 `container` + `text_role`(行高 56) | `navigation::list_item`(一/两/三行 44/60/76,五态状态层) |
|
||
//! | 页头动作 | `frame::text_action`(纯 `text` + 手搓 hover) | `buttons::text`(`Button` 五式 + 状态层) |
|
||
//! | 「Play」 | `frame::text_action` | `buttons::filled`(**全屏唯一实心 accent**,rubric K2) |
|
||
//! | 分隔线 | `frame::divider` | `divider::full` |
|
||
//! | 数据 | `DEMO` 常量 | [`super::model::Instances`](真页面由 presenter 快照转,演示由 `DEMO` 转) |
|
||
//!
|
||
//! 判据没有因此放松:列宽仍由 [`super::layout`] 给(见 `pages/tests.rs` 的 424 断言)。
|
||
//!
|
||
//! ## 行高为什么从 56 变成 60(M90 登记)
|
||
//!
|
||
//! M84 的行高是「`row_height` 44 + `Space::X3` 12 = 56」的手工值;真 `ListItem` 的两行档是
|
||
//! **60**(令牌 `row_height` 44 + 每多一行 16,A1 是 72)。差异来自组件自己的几何真源,
|
||
//! 页面不许覆盖——这正是「接真组件」的应有结果。列表仍高于可视区,独立滚动条照样可见。
|
||
|
||
mod data;
|
||
mod demo;
|
||
mod detail;
|
||
|
||
#[cfg(test)]
|
||
mod tests;
|
||
|
||
#[cfg(test)]
|
||
pub(crate) use data::{DEMO, NOTE, SELECTED};
|
||
pub(super) use demo::demo;
|
||
|
||
use iced::widget::{column, container, row, scrollable};
|
||
use iced::{Alignment, Background, Border, Element, Length, Padding};
|
||
|
||
use unlucky_design::color::Role;
|
||
use unlucky_design::elevation::MaterialLayer;
|
||
use unlucky_design::icons::IconKind;
|
||
use unlucky_design::shape::ShapeScale;
|
||
use unlucky_design::spacing::Space;
|
||
use unlucky_design::typography::TypeRole;
|
||
|
||
use crate::app::components::buttons::{self, Button};
|
||
use crate::app::components::interaction::Interaction;
|
||
use crate::app::components::navigation::list_item::{list_item, ListItem};
|
||
use crate::theme::Ui;
|
||
use unlucky_presenter::router::Route;
|
||
|
||
use super::frame::{self, Header};
|
||
use super::layout::{FrameMetrics, PageLayout};
|
||
use super::model::{Instances, Model, Row};
|
||
use super::{Action, Message};
|
||
|
||
/// 列表行的间距(`Space::X1`;与 M84 同值,行高差异全部来自 `ListItem` 自己的几何)。
|
||
const ROW_GAP: Space = Space::X1;
|
||
|
||
/// 整页(`block.detail = None` 时详情区显示空态)。
|
||
pub fn view<'a>(ui: &'a Ui, metrics: FrameMetrics, model: &'a Model) -> Element<'a, Message> {
|
||
let block = &model.instances;
|
||
let forced = model.forced;
|
||
let header = Header::new("Instances")
|
||
.subtitle("Local versions and their mod loaders")
|
||
.action(buttons::text(
|
||
ui,
|
||
forced_state(
|
||
Button::new("New instance", Message::Action(Action::NewInstance)),
|
||
forced,
|
||
),
|
||
))
|
||
.action(buttons::text(
|
||
ui,
|
||
forced_state(
|
||
Button::new("Import", Message::Action(Action::Import)),
|
||
forced,
|
||
),
|
||
));
|
||
|
||
let body = match metrics.layout {
|
||
PageLayout::ListDetail => frame::panes(
|
||
metrics,
|
||
list_column(ui, block, forced),
|
||
match &block.detail {
|
||
Some(detail) => detail::detail_column(ui, metrics, detail, forced),
|
||
None => detail::detail_empty(ui),
|
||
},
|
||
),
|
||
_ => match &block.detail {
|
||
Some(detail) => detail::narrow_detail(ui, metrics, detail, forced),
|
||
None => frame::single_column(metrics, detail::detail_empty(ui)),
|
||
},
|
||
};
|
||
|
||
frame::page(ui, metrics, header, body)
|
||
}
|
||
|
||
// --------------------------------------------------------------- 列表列
|
||
|
||
fn list_column<'a>(
|
||
ui: &'a Ui,
|
||
block: &'a Instances,
|
||
forced: Option<Interaction>,
|
||
) -> Element<'a, Message> {
|
||
let head = container(
|
||
row![
|
||
container(frame::text_role(
|
||
ui,
|
||
TypeRole::LabelMedium,
|
||
false,
|
||
"ALL INSTANCES",
|
||
ui.color(Role::OnSurfaceVariant),
|
||
))
|
||
.width(Length::Fill)
|
||
.align_y(Alignment::Center),
|
||
frame::text_role_owned(
|
||
ui,
|
||
TypeRole::LabelMedium,
|
||
false,
|
||
block.rows.len().to_string(),
|
||
ui.color(Role::OnSurfaceVariant),
|
||
),
|
||
]
|
||
.width(Length::Fill)
|
||
.align_y(Alignment::Center),
|
||
)
|
||
.width(Length::Fill)
|
||
.padding(Padding {
|
||
top: ui.space(Space::X3),
|
||
right: ui.space(Space::X3),
|
||
bottom: ui.space(Space::X1),
|
||
left: ui.space(Space::X3),
|
||
});
|
||
|
||
let rows = column(
|
||
block
|
||
.rows
|
||
.iter()
|
||
.map(|entry| list_row(ui, entry, is_selected(block, entry), forced))
|
||
.collect::<Vec<_>>(),
|
||
)
|
||
.spacing(ui.space(ROW_GAP))
|
||
.padding(Padding::from([0.0, ui.space(Space::X2)]))
|
||
.width(Length::Fill);
|
||
|
||
// **独立滚动**:只有列表列这一条 scrollable,详情列不跟着滚。
|
||
let scroller = scrollable(rows)
|
||
.direction(scrollable::Direction::Vertical(
|
||
scrollable::Scrollbar::new()
|
||
.width(frame::SCROLLBAR_WIDTH)
|
||
.scroller_width(frame::SCROLLBAR_WIDTH)
|
||
.margin(frame::SCROLLBAR_MARGIN),
|
||
))
|
||
.height(Length::Fill)
|
||
.style(frame::scroll_style(ui));
|
||
|
||
container(column![head, scroller].height(Length::Fill))
|
||
.width(Length::Fill)
|
||
.height(Length::Fill)
|
||
.style(move |_theme| container::Style {
|
||
background: Some(Background::Color(ui.layer(MaterialLayer::Card))),
|
||
border: Border {
|
||
radius: ui.radius_dp(ShapeScale::Large),
|
||
..Border::default()
|
||
},
|
||
..container::Style::default()
|
||
})
|
||
.into()
|
||
}
|
||
|
||
fn is_selected(block: &Instances, entry: &Row) -> bool {
|
||
block
|
||
.detail
|
||
.as_ref()
|
||
.is_some_and(|detail| detail.id == entry.id)
|
||
}
|
||
|
||
/// `--force-state` 的落点:只改**画出来的**状态,不动任何状态机(cli `ForcedState` 的同一条纪律)。
|
||
pub(super) fn forced_state<'a, M>(
|
||
button: Button<'a, M>,
|
||
forced: Option<Interaction>,
|
||
) -> Button<'a, M> {
|
||
match forced {
|
||
Some(state) => button.state(state),
|
||
None => button,
|
||
}
|
||
}
|
||
|
||
/// 一行(`ListItem` 的两/三行档:overline = 运行状态,headline = 名字,supporting = 版本 + 加载器)。
|
||
///
|
||
/// 点一行 = **压一层路由栈**(`Route::Detail(id)`),页面自己不留「选中项」副本——
|
||
/// 于是「当前选中」与「返回栈」永远是同一份真相(`presenter::router`)。
|
||
fn list_row<'a>(
|
||
ui: &'a Ui,
|
||
entry: &'a Row,
|
||
selected: bool,
|
||
forced: Option<Interaction>,
|
||
) -> Element<'a, Message> {
|
||
let mut item = ListItem::new(
|
||
entry.name.as_str(),
|
||
Message::Navigate(Route::Detail(entry.id.clone())),
|
||
)
|
||
.supporting(entry.supporting.as_str())
|
||
.leading(IconKind::Instances)
|
||
.trailing(IconKind::ChevronRight);
|
||
|
||
if let Some(status) = &entry.status {
|
||
item = item.overline(status.as_str());
|
||
}
|
||
if selected {
|
||
item = item.selected();
|
||
}
|
||
if let Some(state) = forced {
|
||
item = item.state(state);
|
||
}
|
||
|
||
list_item(ui, item)
|
||
}
|