Compare commits

...
Author SHA1 Message Date
Martin Ball 50f7d917d1 Merge remote-tracking branch 'origin/main' into HEAD 2026-11-21 15:25:35 +00:00
Martin BallandClaude Opus 5.5 4d9513dbe4 #7165: compact Symbol menu cells and Unicode-name tooltips
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-20 23:36:46 +00:00
2 changed files with 84 additions and 5 deletions
+60 -5
View File
@@ -8,7 +8,7 @@ use craft::ui::buttons::{Arrangement, Button, IconButton};
use craft::ui::contract::{ActivateOn, BodyCx, CollectionEvent, Gap, Props as _, SelectMode, Show as _, ShowCollection as _, ShowContainer as _};
use craft::ui::display::Divider;
use craft::ui::layout_components::Stack;
use craft::ui::list::ThumbAspect;
use craft::ui::list::{ThumbAspect, ThumbSize};
use craft::ui::menu::{Menu, MenuItem};
use craft::ui::primitives::{HAlign, IconSpec, TextRun};
use craft::ui::tile_grid::{CaptionPlace, Tile, TileGrid};
@@ -286,7 +286,61 @@ pub(super) fn insert(row: &mut RibbonRow<'_>, app: &mut WordApp) {
});
}
/// The recent and common characters as a grid of six per row; a click inserts the character, remembers it and closes
/// The Unicode names (Unicode Standard, UnicodeData.txt) of the characters the grid offers first. No Unicode-names
/// crate is installed, and the one on crates.io is under Unicode-DFS-2016, which the licence allowlist lacks.
const SYMBOL_NAMES: &[(char, &str)] = &[
('\u{A9}', "COPYRIGHT SIGN"),
('\u{AE}', "REGISTERED SIGN"),
('\u{2122}', "TRADE MARK SIGN"),
('\u{A7}', "SECTION SIGN"),
('\u{B6}', "PILCROW SIGN"),
('\u{20AC}', "EURO SIGN"),
('\u{A3}', "POUND SIGN"),
('\u{A5}', "YEN SIGN"),
('\u{B0}', "DEGREE SIGN"),
('\u{B1}', "PLUS-MINUS SIGN"),
('\u{2260}', "NOT EQUAL TO"),
('\u{2264}', "LESS-THAN OR EQUAL TO"),
('\u{2265}', "GREATER-THAN OR EQUAL TO"),
('\u{F7}', "DIVISION SIGN"),
('\u{D7}', "MULTIPLICATION SIGN"),
('\u{221E}', "INFINITY"),
('\u{B5}', "MICRO SIGN"),
('\u{3B1}', "GREEK SMALL LETTER ALPHA"),
('\u{3B2}', "GREEK SMALL LETTER BETA"),
('\u{3C0}', "GREEK SMALL LETTER PI"),
('\u{3A9}', "GREEK CAPITAL LETTER OMEGA"),
('\u{2211}', "N-ARY SUMMATION"),
('\u{221A}', "SQUARE ROOT"),
('\u{2192}', "RIGHTWARDS ARROW"),
('\u{2190}', "LEFTWARDS ARROW"),
('\u{2713}', "CHECK MARK"),
('\u{2605}', "BLACK STAR"),
('\u{2665}', "BLACK HEART SUIT"),
('\u{2014}', "EM DASH"),
('\u{2026}', "HORIZONTAL ELLIPSIS"),
];
/// A symbol's hover text: its Unicode name and code point (the code point alone, with its block, for a character
/// not named above), then its font when it has one.
pub(super) fn symbol_tip(glyph: &str, font: &str) -> String {
let mut chars = glyph.chars();
let tip = match (chars.next(), chars.next()) {
(Some(c), None) => {
let name = SYMBOL_NAMES.iter().find(|(n, _)| *n == c).map(|(_, name)| *name);
let block = crate::dialogs_insert::subset_of(c);
match (name, block) {
(Some(name), _) => format!("{name} (U+{:04X})", c as u32),
(None, Some(block)) => format!("U+{:04X} ({block})", c as u32),
(None, None) => format!("U+{:04X}", c as u32),
}
}
_ => glyph.to_string(),
};
if font.is_empty() { tip } else { format!("{tip}, {font}") }
}
/// The recent and common characters as a compact grid; a click inserts the character, remembers it and closes
/// the menu.
fn symbol_grid(ui: &mut Ui, cx: &mut BodyCx<'_>, app: &mut WordApp) {
// Recently used symbols first (their font on hover), then common ones.
@@ -305,19 +359,20 @@ fn symbol_grid(ui: &mut Ui, cx: &mut BodyCx<'_>, app: &mut WordApp) {
.activate(ActivateOn::Click)
.caption(CaptionPlace::None)
.card_columns(6)
.content_cells()
// Small cells (#7165): a glyph needs no more room than the small thumbnail step.
.thumb_size(ThumbSize::Small)
// At most thirty symbols, all shown; the menu's body is the one scroll.
.natural_height(true)
.show_items(ui, &SymbolCells(items.len()), &mut |key, _| {
let (c, font) = items.get(*key).cloned().unwrap_or_default();
let glyph = c.clone();
let (glyph, tip) = (c.clone(), symbol_tip(&c, &font));
let tile = Tile::new(c).thumb(ThumbAspect::SQUARE, move |cx, rect| {
let run = TextRun::new(glyph.as_str()).align(HAlign::Center);
cx.with_draw(|d| {
d.text_on_centre_line(rect, &run);
});
});
if font.is_empty() { tile } else { tile.tooltip(font) }
tile.tooltip(tip)
});
for event in &out.response.events {
if let CollectionEvent::Activate(key) = event
+24
View File
@@ -728,3 +728,27 @@ fn table_shading_split_keeps_palette_and_apply_separate() {
h.state_mut().run("edit.undo", json!({})).unwrap();
assert_eq!(first_cell_shading(h.state()), Some(red), "No Color is undone in one step");
}
/// #7165: the Symbol drop-down's cells are compact (a thumbnail-small step, not a card) and the hover text names
/// the character, not just the glyph.
#[test]
fn symbol_menu_cells_are_compact_and_the_tooltip_names_the_character() {
let app = WordApp::new(Session::new(wordcraft_doc::Document::from_text("Text")), crate::Services::default());
let mut h = tab_harness(app, "Insert");
click_button(&mut h, "Symbol");
let cell = h.get_by_label("\u{A9}").rect();
assert!(cell.width() <= 80.0 && cell.height() <= 80.0, "a symbol cell is compact, got {:?}", cell.size());
h.get_by_label("\u{A9}").hover();
crate::test_harness::frames(&mut h, 40);
assert!(h.query_by_label_contains("COPYRIGHT SIGN (U+00A9)").is_some(), "the tooltip names the character");
}
/// Characters outside the common list still say what they are: code point and block.
#[test]
fn symbol_tip_names_known_characters_and_falls_back_to_the_code_point() {
use super::insert::symbol_tip;
assert_eq!(symbol_tip("\u{A9}", ""), "COPYRIGHT SIGN (U+00A9)");
assert_eq!(symbol_tip("\u{3B1}", "Symbol"), "GREEK SMALL LETTER ALPHA (U+03B1), Symbol");
assert_eq!(symbol_tip("\u{2602}", ""), "U+2602 (Miscellaneous Symbols)");
assert_eq!(symbol_tip("", ""), "");
}