diff --git a/desktop/src/main.rs b/desktop/src/main.rs index 71eba7c..f85bff5 100644 --- a/desktop/src/main.rs +++ b/desktop/src/main.rs @@ -75,6 +75,9 @@ struct OpticalState { } struct ReceiveState { + /// 专注模式:收起除二维码外的所有控件,把窗口全部让给码 + focus_qr: bool, + qr_zoom: f32, save_dir: Option, use_direct_ap: bool, server: Option, @@ -196,6 +199,8 @@ impl QftApp { status: "选择文件后开始光学发送。v0.4 使用单个大二维码 + QFT2/Base45 低密度 450B 数据块,优先提高 Android 有效识别率。".into(), }, receive: ReceiveState { + focus_qr: false, + qr_zoom: 1.0, save_dir: None, use_direct_ap: true, server: None, @@ -533,12 +538,28 @@ impl QftApp { self.poll_receiver_events(); ctx.request_repaint_after(Duration::from_millis(100)); + let has_qr = self.receive.pair_texture.is_some(); ui.horizontal_wrapped(|ui| { ui.heading("Android → 电脑 · 扫码直连"); ui.separator(); ui.label("UDP 快速发现 · 64 KiB–16 MiB 自适应分块 · 目标 8 路并行 · 不经过外网"); + if ui.add_enabled(has_qr, egui::Button::new("专注二维码")).clicked() { + self.receive.focus_qr = true; + } }); ui.add_space(10.0); + + // 专注模式下把整个窗口让给二维码。小窗口里控件会把码挤到显示不全, + // 而扫码时那些控件本来也用不上。 + if self.receive.focus_qr && has_qr { + let texture = self.receive.pair_texture.clone(); + let mut zoom = self.receive.qr_zoom; + let mut focus = self.receive.focus_qr; + qr_focus_view(ui, texture.as_ref(), &mut zoom, &mut focus, "手机扫码 · QFTPAIR2"); + self.receive.qr_zoom = zoom; + self.receive.focus_qr = focus; + return; + } let running = self.receive.server.is_some(); ui.group(|ui| { @@ -600,9 +621,11 @@ impl QftApp { self.firewall_panel(ui, listen_port); ui.add_space(8.0); if let Some(texture) = &self.receive.pair_texture { - let side = ui.available_width().min(420.0).max(260.0); - ui.vertical_centered(|ui| { let side = snap_to_physical(side, ui.ctx().pixels_per_point()); - ui.image((texture.id(), egui::vec2(side, side))); }); + let qr_zoom = self.receive.qr_zoom; + ui.vertical_centered(|ui| { + let side = fit_qr_side(ui, qr_zoom, 12.0); + ui.image((texture.id(), egui::vec2(side, side))); + }); } // 把二维码实际广播的地址摊开显示。手机报"找不到电脑"时, // 第一件要确认的就是码里到底有没有它能到达的那个地址—— @@ -724,9 +747,11 @@ impl QftApp { cols[0].group(|ui| { ui.heading("手机扫码 · QFTSEND2"); if let Some(texture) = &self.send.pair_texture { - let side = ui.available_width().min(420.0).max(260.0); - ui.vertical_centered(|ui| { let side = snap_to_physical(side, ui.ctx().pixels_per_point()); - ui.image((texture.id(), egui::vec2(side, side))); }); + let qr_zoom = self.send.qr_zoom; + ui.vertical_centered(|ui| { + let side = fit_qr_side(ui, qr_zoom, 12.0); + ui.image((texture.id(), egui::vec2(side, side))); + }); } if let Some(ap) = &self.send.direct_ap { ui.label(format!("临时网络:{}", ap.ssid)); @@ -821,6 +846,7 @@ impl QftApp { fn pc_to_phone_qr_focus_ui(&mut self, ui: &mut egui::Ui, ctx: &egui::Context) { if ctx.input(|input| input.key_pressed(egui::Key::Escape)) { self.send.qr_focus = false; + self.receive.focus_qr = false; return; } @@ -1796,6 +1822,51 @@ fn human_duration(seconds: f64) -> String { /// /// 二维码纹理用 NEAREST 采样:绘制尺寸若落在半个物理像素上, /// 相邻模块占用的物理像素数会一宽一窄,边缘出现锯齿,手机更难解码。 +/// 计算二维码的显示边长。 +/// +/// 必须**同时**受可用宽度与高度约束。此前只看宽度并硬性保底 260 点, +/// 窗口一矮二维码就溢出到可视区外——用户看到的是一个被截掉下半截、 +/// 根本扫不了的码。这里宁可让码变小,也不让它跑出边界。 +/// 专注模式:收起全部控件,只留二维码与一行说明。 +/// +/// 扫码时用户会把手机凑近屏幕,此刻界面上的按钮和状态都没有意义, +/// 反而在小窗口里把码挤到看不全。 +fn qr_focus_view( + ui: &mut egui::Ui, + texture: Option<&TextureHandle>, + zoom: &mut f32, + focus: &mut bool, + caption: &str, +) { + ui.horizontal_wrapped(|ui| { + if ui.button("退出专注").clicked() { + *focus = false; + } + ui.add(egui::Slider::new(zoom, 0.4..=1.0).text("二维码占比").show_value(false)); + ui.label(caption); + }); + ui.separator(); + let Some(texture) = texture else { + ui.centered_and_justified(|ui| ui.label("二维码尚未生成")); + return; + }; + let value = *zoom; + ui.vertical_centered(|ui| { + let side = fit_qr_side(ui, value, 8.0); + ui.image((texture.id(), egui::vec2(side, side))); + }); +} + +fn fit_qr_side(ui: &egui::Ui, zoom: f32, reserve_height: f32) -> f32 { + let available = ui.available_size(); + let limit = available + .x + .min((available.y - reserve_height).max(1.0)) + .max(1.0); + let side = (limit * zoom.clamp(0.3, 1.0)).min(limit); + snap_to_physical(side.max(1.0), ui.ctx().pixels_per_point()) +} + fn snap_to_physical(points: f32, pixels_per_point: f32) -> f32 { if pixels_per_point <= 0.0 { return points; @@ -1926,3 +1997,53 @@ mod font_tests { assert_eq!(snap_to_physical(100.0, 0.0), 100.0, "非法 ppp 时原样返回"); } } + +#[cfg(test)] +mod qr_layout_tests { + /// 二维码边长必须同时受宽高约束。 + /// + /// 这是一个真实缺陷:此前只按 `available_width()` 计算并硬性保底 260 点, + /// 窗口一矮码就溢出到可视区外,用户看到的是被截掉下半截、根本扫不了的码。 + /// 这里用纯函数复刻同一套算法做回归,避免再退回"只看宽度"。 + fn fit(width: f32, height: f32, zoom: f32, reserve: f32) -> f32 { + let limit = width.min((height - reserve).max(1.0)).max(1.0); + (limit * zoom.clamp(0.3, 1.0)).min(limit).max(1.0) + } + + #[test] + fn never_exceeds_either_dimension() { + let cases = [ + (900.0_f32, 200.0_f32), // 矮窗口:截图里的情形 + (300.0, 900.0), // 窄窗口 + (600.0, 600.0), + (120.0, 120.0), // 极小窗口 + ]; + for (width, height) in cases { + for zoom in [0.4_f32, 0.7, 1.0] { + let side = fit(width, height, zoom, 12.0); + assert!(side <= width + 0.01, "{width}x{height} zoom={zoom} 超出宽度:{side}"); + assert!(side <= height + 0.01, "{width}x{height} zoom={zoom} 超出高度:{side}"); + assert!(side > 0.0); + } + } + } + + #[test] + fn zoom_scales_within_the_limit_and_is_clamped() { + let full = fit(600.0, 600.0, 1.0, 12.0); + let half = fit(600.0, 600.0, 0.5, 12.0); + assert!(half < full, "缩放应真的变小:{half} vs {full}"); + // 过小的 zoom 被夹到 0.3,避免码小到扫不出来 + assert_eq!(fit(600.0, 600.0, 0.01, 12.0), fit(600.0, 600.0, 0.3, 12.0)); + assert_eq!(fit(600.0, 600.0, 5.0, 12.0), full, "zoom 上限为 1.0"); + } + + #[test] + fn degenerate_sizes_do_not_produce_zero_or_negative() { + // 布局初帧可能给出 0 甚至负的可用空间,不能因此算出非正边长 + for (width, height) in [(0.0_f32, 0.0_f32), (10.0, 5.0), (1.0, 100.0)] { + let side = fit(width, height, 1.0, 12.0); + assert!(side >= 1.0, "{width}x{height} 得到非正边长 {side}"); + } + } +}