From c560b66df6bd5eb99ee1e46e84a520e726155524 Mon Sep 17 00:00:00 2001 From: AskaEth Date: Wed, 4 Nov 2026 20:54:10 +0800 Subject: [PATCH] =?UTF-8?q?chore(app-iced):=20M107=20rebase=20=E5=88=B0=20?= =?UTF-8?q?M102=20=E4=B9=8B=E5=90=8E=E7=9A=84=E6=94=B6=E5=B0=BE=EF=BC=88?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=A1=8C=E6=95=B0=20+=20=E6=9C=AA=E7=94=A8?= =?UTF-8?q?=20import=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 解 rebase 冲突时把 M102 的 `extra_width_goes_to_the_page_block_*` 留在 `download/tests.rs` 会让该文件到 404 行（超 400 硬线），挪到 `download/tests/rails.rs` （同一批判据，模块路径改 `crate::pages::frame::body_width`）；顺手去掉挪走后多余的 `measure_cap_px` import。 无行为变化：只搬测试 + 删 import。门禁见报告（fmt 0 / clippy 0 / lib 481 passed / workspace 0）。 --- crates/app-iced/src/pages/download/tests.rs | 21 +--------------- .../src/pages/download/tests/rails.rs | 24 ++++++++++++++++++- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/crates/app-iced/src/pages/download/tests.rs b/crates/app-iced/src/pages/download/tests.rs index f43405b..a1b3e56 100644 --- a/crates/app-iced/src/pages/download/tests.rs +++ b/crates/app-iced/src/pages/download/tests.rs @@ -14,7 +14,7 @@ use unlucky_presenter::state::AppState; use crate::theme::{Families, Ui}; -use super::super::layout::{frame_metrics, measure_cap_px, PaneKit}; +use super::super::layout::{frame_metrics, PaneKit}; use super::model::{Category, Download}; use super::options::InstallDraft; @@ -74,25 +74,6 @@ fn the_page_kit_is_still_single() { } } -/// 宽窗下多出来的宽度归**页面块**，不归散文列（M102 订正；旧口径是「留白」）。 -/// -/// 抓得住：谁把整页块又压回 424（视觉复审 ① 的原样：块宽 = `column`，1180 下左右各留 ~300px）； -/// 抓不住：真实像素（报告里的量测表负责）。 -#[test] -fn extra_width_goes_to_the_page_block_not_to_the_prose_column() { - let metrics = frame_metrics(PaneKit::Single, 1180.0); - assert_eq!(metrics.column, measure_cap_px(), "散文列仍是行宽上限 424"); - assert_eq!( - super::super::frame::body_width(metrics), - metrics.available, - "页面块必须吃满可用宽度（1044），不是被居中压成 424" - ); - assert!( - metrics.available - metrics.column >= 400.0, - "两个量要分得开：块宽 1044 比散文列 424 宽出 620" - ); -} - // --------------------------------------------------------------- 两层侧栏（见 `tests/rails.rs`） mod rails; diff --git a/crates/app-iced/src/pages/download/tests/rails.rs b/crates/app-iced/src/pages/download/tests/rails.rs index e12866e..b575d76 100644 --- a/crates/app-iced/src/pages/download/tests/rails.rs +++ b/crates/app-iced/src/pages/download/tests/rails.rs @@ -9,7 +9,10 @@ use unlucky_presenter::state::AppState; use crate::pages::download::options::InstallDraft; use crate::pages::download::rails::major_entries; use crate::pages::download::{Category, Download}; -use crate::pages::layout::{available_width, VersionRailTier, VersionRails, RAIL_GAP}; +use crate::pages::layout::{ + available_width, frame_metrics, measure_cap_px, PaneKit, VersionRailTier, VersionRails, + RAIL_GAP, +}; /// 三栏要吃掉整条可用宽（不是 424 的居中正文列）——三个宽度档各取一个采样点。 /// @@ -153,3 +156,22 @@ fn every_bucket_is_reachable_in_the_chips_tier() { "竖栏与 chips 行必须吃同一份 entries" ); } + +/// 宽窗下多出来的宽度归**页面块**，不归散文列（M102 订正；旧口径是「留白」）。 +/// +/// 抓得住：谁把整页块又压回 424（视觉复审 ① 的原样：块宽 = `column`，1180 下左右各留 ~300px）； +/// 抓不住：真实像素（报告里的量测表负责）。 +#[test] +fn extra_width_goes_to_the_page_block_not_to_the_prose_column() { + let metrics = frame_metrics(PaneKit::Single, 1180.0); + assert_eq!(metrics.column, measure_cap_px(), "散文列仍是行宽上限 424"); + assert_eq!( + crate::pages::frame::body_width(metrics), + metrics.available, + "页面块必须吃满可用宽度（1044），不是被居中压成 424" + ); + assert!( + metrics.available - metrics.column >= 400.0, + "两个量要分得开：块宽 1044 比散文列 424 宽出 620" + ); +}