Compare commits

...
Author SHA1 Message Date
FredApps 05be8a8096 Tests: aim the title bar button helper at the button's own node
The Save button's accessible label carries its tooltip text, so the
label query matches the button itself on the first hover position,
left of the button, and the click missed it. Return the matched
node's centre instead of the hover position.

Signed-off-by: FredApps <153173854+FredApps@users.noreply.github.com>
2026-11-18 17:44:53 +07:00
FredApps 0eede0e4a7 Grid: move the keyboard owner check out of keyboard()
With #1385, #1960 and #2040 on main, keyboard() reached a cognitive
complexity of 31 against the workspace limit of 30, so clippy fails on
main. The guard that returns when an editor, dialog, message, menu or
another widget owns the keyboard moves into keyboard_elsewhere(),
unchanged.

Signed-off-by: FredApps <153173854+FredApps@users.noreply.github.com>
2026-11-18 16:53:20 +07:00
FredApps c1dd8a1184 Tests: import SheetApp in the pivot pane tests
The field-list scrollbar test that #2293 added builds SheetApp directly,
but on main pivot_pane.rs no longer imports it (its other test goes
through crate::common::app). Since the merge of #2293 the ui-egui it test
binary does not build on main.

Signed-off-by: FredApps <153173854+FredApps@users.noreply.github.com>
2026-11-18 16:51:28 +07:00
3 changed files with 15 additions and 7 deletions
+10 -4
View File
@@ -2,8 +2,10 @@ use super::geo::Geo;
use super::menus::is_checkbox;
use super::{CellRef, Drag, Sheet, SheetApp, json};
/// Grid keyboard handling when no text field has focus.
pub(super) fn keyboard(app: &mut SheetApp, ctx: &egui::Context, resp: &egui::Response, geo: &Geo, sh: &Sheet) {
/// Whether something other than the grid owns the keyboard this frame: an editor, a dialog, a
/// message, a menu or another focused widget. Kept out of [`keyboard`] to hold its complexity
/// within the workspace limit.
fn keyboard_elsewhere(app: &SheetApp, ctx: &egui::Context, resp: &egui::Response) -> bool {
// Focus left on an editor that no longer exists goes back to the grid.
let stale = [egui::Id::unique("gridcraft.cell_editor"), egui::Id::unique("gridcraft.formula_bar"), crate::text_box::editor_id()];
let editing = app.editor.is_some() || app.text_box_editor.is_some();
@@ -14,7 +16,7 @@ pub(super) fn keyboard(app: &mut SheetApp, ctx: &egui::Context, resp: &egui::Res
// An open filter menu owns the keyboard even when a click inside it left focus on nothing (#1516).
// So do the fill menu (its Esc closes it, not the copy) and the right-drag that opens it (an
// arrow key would move the selection the menu fills from), and a macro's question.
if editing
editing
|| app.dialog.is_some()
|| other_focus
|| app.message.is_some()
@@ -22,7 +24,11 @@ pub(super) fn keyboard(app: &mut SheetApp, ctx: &egui::Context, resp: &egui::Res
|| app.grid.fill_menu.is_some()
|| matches!(app.grid.drag, Drag::Fill { menu: true, .. })
|| app.macros.question.is_some()
{
}
/// Grid keyboard handling when no text field has focus.
pub(super) fn keyboard(app: &mut SheetApp, ctx: &egui::Context, resp: &egui::Response, geo: &Geo, sh: &Sheet) {
if keyboard_elsewhere(app, ctx, resp) {
return;
}
if ctx.memory(|m| m.focused()).is_none() {
+4 -2
View File
@@ -176,8 +176,10 @@ fn title_bar_button(h: &mut egui_kittest::Harness<'static, SheetApp>, name: &str
let at = egui::pos2(x, autosave.center().y);
h.hover_at(at);
h.run_steps(3);
if h.query_by_label_contains(&tip).is_some() {
return at;
// The button's accessible label carries its tooltip, so the node found may be the button
// itself rather than a tooltip at the pointer: aim at the node.
if let Some(node) = h.query_by_label_contains(&tip) {
return node.rect().center();
}
x += 6.0;
}
+1 -1
View File
@@ -2,7 +2,7 @@
use egui::{Color32, RawInput, Rect, Shape, pos2, vec2};
use gridcraft_engine::Session;
use gridcraft_ui_egui::theme;
use gridcraft_ui_egui::{SheetApp, theme};
use serde_json::json;
/// Builds a pivot report at D3 and returns the painted shapes after six frames in the caller's light or dark mode.