Fix main's build and tests after the recent merges (#4474)

- Import SheetApp in the pivot pane tests.
- Move the keyboard owner check out of keyboard() to stay within the complexity limit.
- Aim the title bar button helper at the button's own node.

Fixes #4473.

Signed-off-by: FredApps <153173854+FredApps@users.noreply.github.com>
This commit is contained in:
FredApps authored and GitHub committed 2026-11-18 19:50:37 +07:00
1 parent c9d2883b86
commit 8f8078c134
3 files changed
+15 -7

No files matched your search

+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.