aleleba/wordcraft
1
0
Fork 0
mirror of https://github.com/storytold/wordcraft.git synced 2026-10-25 02:47:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

#3039: mini toolbar font colour Automatic returns focus to the document (#3043)

Browse Source 
Co-authored-by: Brandon Thomas <brandon@storyteller.ai>
This commit is contained in:
SlavenDj
2026-10-19 03:04:49 -04:00
committed by GitHub
co-authored by Brandon Thomas
parent 25ad07f868
commit ebabb57e5e
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/mini_toolbar.rs
+23 -1
View File
@@ -305,7 +305,7 @@ pub(crate) fn highlight_menu(ui: &mut egui::Ui, app: &mut WordApp) {
fn font_color_menu(ui: &mut egui::Ui, app: &mut WordApp) {
egui::ScrollArea::vertical().max_height(280.0).show(ui, |ui| {
if ui.selectable_label(false, "Automatic").clicked() {
let _ = app.run("format.color", json!({"color": "auto"}));
widgets::run_from_ribbon(app, "format.color", json!({"color": "auto"}));
ui.close();
return;
}
@@ -679,6 +679,28 @@ mod tests {
assert_eq!(format_state(&mut h).get("highlight"), Some(&Value::Null), "the button applies No Color, not yellow again");
}
/// #3039: picking Automatic from the bar's font-colour menu hands the keyboard back to the
/// document.
#[test]
fn the_font_colour_menus_automatic_returns_focus_to_the_document() {
use egui_kittest::kittest::{By, Queryable};
let mut a = WordApp::new(wordcraft_engine::Session::new(wordcraft_doc::Document::from_text("Hello")), Default::default());
a.run("select.all", json!({})).unwrap();
let mut h = egui_kittest::Harness::builder().with_size(Vec2::new(400.0, 400.0)).build_ui_state(
|ui, app: &mut WordApp| {
egui::Area::new(egui::Id::new("font_colour_probe")).fixed_pos(pos2(50.0, 50.0)).show(ui.ctx(), |ui| {
font_color_menu(ui, app);
});
},
a,
);
steps(&mut h);
let automatic = h.get(By::new().label_contains("Automatic")).rect().center();
h.state_mut().canvas.want_focus = false;
click_at(&mut h, automatic);
assert!(h.state().canvas.want_focus, "Automatic returns focus to the document");
}
/// #3038: a pick from the bar's highlight grid hands the keyboard back to the document,
/// like the No Color button beside the swatches (it ran through `run_from_ribbon` already).
#[test]