Documents: zoom anchors past the centring offset; key zoom keeps the page's left edge (R2.7)

This commit is contained in:
ZacharyZhang-NY committed 2026-10-09 04:40:12 -04:00
1 parent 3f567bf4a0
commit 2537472bd3
4 files changed
+56 -14

No files matched your search

+1
View File
@@ -268,3 +268,4 @@ cargo run -p ely-doc 启动一个应用(ElyDoc 先 cargo build -p ely
- 2026-10-09:ElyMark 的表格(R2.13)。表格的空格与分隔行写法有许多种(`|a|b|`、`|---|`、对齐空格),逐字重现做不到,原先凡写不回原样的表格都成了原文块。现在表格按单元格比较:把原文这一段单独解析,与编辑器里的表格节点相同即为可视块(`preserve.js` 的 `kept`);未改的表格照旧逐字写回,改过的表格按文档多数表格的写法重写(`style.js` 投票:单元格两侧有无空格、是否按列对齐,经 remark-gfm 的 `tableCellPadding` 与 `tablePipeAlign`;原先投票的解析器不认 GFM,表格从未计票)。改过的表格分隔行按此写法重写(如 `|---|` 成 `| - |`)。
- 2026-10-09:ElyTable 新插图表的位置(R2.10)。内核按“定位区域”把图表放在其旁的空处;带参数的请求(Ely 经 `FN_PARAM_5` 给区域)原把定位区域取为光标格,图表紧贴光标、压在数据上。补丁 `0041-lok-calc-chart-beside-its-data.patch`:定位区域取请求里的数据区域(多段取并集),同对话框路径取所选单元格。
- 2026-10-09:ElyPDF 编辑与缩放不闪白(R2.6)。旧图块不再随编辑或比例变化即刻丢弃:编辑落地时全部当前图块、比例变化时离开视图的同页图块,连同当时的页面尺寸进入“底图”(`apps/ely-pdf/src/backdrop.rs`),按其在页面中的比例位置画在该页新图块之下,直到该页在视口里的新图块到齐、或页面尺寸与旋转变了才释放;每页画什么由 `PdfView::pieces` 决定,绘制与测试同用它。原先比较整份尺寸表(超过 100 页的混合纸张文档尺寸表后段为占位,比较失败即全部清空)且只认同比例的图块(编辑后右栏收起、比例变化即清空),都会闪白。
- 2026-10-09:文档的缩放锚点(R2.7)。窄于视口的文档居中,缩放原按视口坐标求锚点、漏了居中的偏移,锚点随缩放漂移;现锚点先减去缩放前的偏移,缩放后按新的偏移(`LokView::slack`,绘制同用)换回。按键与菜单的缩放(无指针)另保持首页左缘在视口内;指针与捏合的缩放保持指针下的点不动(文档边界以外即止)。
+10 -11
View File
@@ -249,6 +249,15 @@ impl LokView {
}
}
/// Room beside a narrow document, which sits centred.
pub(super) fn slack(&self) -> (f32, f32) {
let extent = self.extent();
let slack = |view: f32, doc: i32| (view - self.geom.px_of(doc)).max(0.0) / 2.0;
// A fitted page sits centred both ways.
let down = if self.fit { slack(self.viewport.1, extent.1) } else { 0.0 };
(slack(self.viewport.0, extent.0), down)
}
/// The page mask and visible tiles; requests the missing ones.
pub(super) fn prepare(&mut self, bounds: Bounds<Pixels>) -> Painted {
self.viewport = (bounds.size.width.into(), bounds.size.height.into());
@@ -259,18 +268,8 @@ impl LokView {
self.clamp_scroll();
let geom = self.geom;
let (sx, sy) = self.scroll;
// A narrow document sits centered.
let extent = self.extent();
let slack = |view: f32, doc: i32| (view - geom.px_of(doc)).max(0.0) / 2.0;
// A fitted page sits centred both ways.
self.spare = (
slack(self.viewport.0, extent.0),
if self.fit {
slack(self.viewport.1, extent.1)
} else {
0.0
},
);
self.spare = self.slack();
let pages = if self.pages.is_empty() {
vec![self.tile_screen_rect((0, 0, extent.0, extent.1))]
} else {
+37
View File
@@ -115,3 +115,40 @@ fn a_page_stays_centred_when_the_cursor_moves() {
})
});
}
#[test]
fn zooming_keeps_the_left_page_edge_or_the_pointed_spot() {
let Some(install) = crate::client::tests::install() else {
eprintln!("SKIP: no pinned LOK build");
return;
};
let cx = gpui::TestAppContext::single();
cx.update(|app| {
let (view, _) = live_view(app, &install);
view.update(app, |view, cx| {
let room = Bounds { origin: point(px(0.0), px(0.0)), size: size(px(1200.0), px(900.0)) };
view.prepare(room);
let page = *view.pages.first().expect("a laid out page");
// Unclamped, so a cut edge reads below zero.
let left = |view: &LokView| view.spare.0 + view.geom.px_of(view.tile_of((page.0, page.1)).0 - view.scroll.0);
for _ in 0..3 {
view.zoom_step(true, cx);
view.prepare(room);
assert!(left(view) >= 0.0, "at {}% the left edge is at {}", view.zoom() * 100.0, left(view));
}
view.set_zoom(1.0, cx);
view.prepare(room);
view.set_zoom(2.0, cx);
view.prepare(room);
assert!(left(view) >= 0.0, "a set zoom keeps the left edge: {}", left(view));
view.set_zoom(1.0, cx);
view.prepare(room);
let at = point(px(600.0), px(400.0));
let before = view.doc_point(at);
view.zoom_at(1.5, Some(at), cx);
view.prepare(room);
let after = view.doc_point(at);
assert!((after.0 - before.0).abs() < 30 && (after.1 - before.1).abs() < 30, "{before:?} moved to {after:?}");
})
});
}
+8 -3
View File
@@ -48,15 +48,20 @@ impl LokView {
None => (self.viewport.0 / 2.0, self.viewport.1 / 2.0),
};
// Anchored in print twips: tile twips change with the zoom.
let under = self.print_of((self.scroll.0 + self.geom.twips_of(ax), self.scroll.1 + self.geom.twips_of(ay)));
let (sx, sy) = (ax - self.spare.0, ay - self.spare.1);
let under = self.print_of((self.scroll.0 + self.geom.twips_of(sx), self.scroll.1 + self.geom.twips_of(sy)));
self.fit = false;
if (zoom - self.geom.zoom).abs() > 0.0001 {
self.geom.zoom = zoom;
self.retire_tiles();
self.failed.clear();
}
let under = self.tile_of(under);
self.scroll = (under.0 - self.geom.twips_of(ax), under.1 - self.geom.twips_of(ay));
let (under, spare) = (self.tile_of(under), self.slack());
self.scroll = (under.0 - self.geom.twips_of(ax - spare.0), under.1 - self.geom.twips_of(ay - spare.1));
// Keys and menus keep the page's left edge in view.
if let (None, Some(page)) = (at, self.pages.first()) {
self.scroll.0 = self.scroll.0.min(self.tile_of((page.0, page.1)).0);
}
self.clamp_scroll();
log::debug!("lok: zoom {:.0}%", zoom * 100.0);
cx.emit(Zoomed);