masi/solvecraft
1
0
Fork 0
mirror of https://github.com/bherbruck/solidcraft.git synced 2026-11-10 18:55:14 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

About: the licences under Licences are indented so they read as its contents (#14442)

Browse Source 
* claim: #14388 (indent the licences under Licences in About)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* About: indent the licences under Licences so they read as its contents

NOTICE, MIT, Apache 2.0 and Third-party licences sat at the same indent as
Licences, so after opening it they looked like more sections beside it.
They are now indented by the theme's 14 pt spacing, as the Model
Parameters groups are.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
0rdnungsamt
2026-11-10 14:48:01 +00:00
committed by GitHub
parent 5f46248771
commit 3e2cc277ee
1 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/help.rs
+34 -11
View File
@@ -213,18 +213,22 @@ fn about(app: &mut SolveApp, ctx: &egui::Context) {
ui_kit::text(ui, solidcraft_ui_text::tr("help.font_details"), ui_kit::Text::Report("fonts", false));
});
ui_kit::section(ui, "licences", solidcraft_ui_text::tr("help.licences"), false, |ui| {
for (id, title, text) in
[("notice", "help.notice", NOTICE), ("mit", "help.mit", LICENSE_MIT), ("apache", "help.apache", LICENSE_APACHE)]
{
ui_kit::section(ui, id, solidcraft_ui_text::tr(title), false, |ui| {
ui_kit::text(ui, text, ui_kit::Text::Report(id, false));
});
}
ui_kit::section(ui, "third_party", solidcraft_ui_text::tr("help.third_party"), false, |ui| {
if ui_kit::button(ui, solidcraft_ui_text::tr_label("Copy all licences"), ui_kit::Button::Normal).clicked() {
ctx.copy_text(solidcraft_engine::licences::all());
// Indented, so the licences read as the children of Licences (#14388).
ui.spacing_mut().indent = solidcraft_theme::Tokens::get().space_14;
ui.indent("licence_list", |ui| {
for (id, title, text) in
[("notice", "help.notice", NOTICE), ("mit", "help.mit", LICENSE_MIT), ("apache", "help.apache", LICENSE_APACHE)]
{
ui_kit::section(ui, id, solidcraft_ui_text::tr(title), false, |ui| {
ui_kit::text(ui, text, ui_kit::Text::Report(id, false));
});
}
ui_kit::text_lines(ui, "sc_third_party", THIRD_PARTY);
ui_kit::section(ui, "third_party", solidcraft_ui_text::tr("help.third_party"), false, |ui| {
if ui_kit::button(ui, solidcraft_ui_text::tr_label("Copy all licences"), ui_kit::Button::Normal).clicked() {
ctx.copy_text(solidcraft_engine::licences::all());
}
ui_kit::text_lines(ui, "sc_third_party", THIRD_PARTY);
});
});
});
});
@@ -261,6 +265,25 @@ mod tests {
}
}
/// #14388: the licences inside Licences are indented under its heading, so they read as its
/// children rather than as more sections beside it.
#[test]
fn the_licences_sit_indented_under_their_heading() {
let mut h = crate::scenario::Harness::new();
h.app.help.about = true;
h.frames(2);
let key = |id: &str| format!("dialog:section:{}", solidcraft_ui_text::tr(id));
h.step(&serde_json::json!({"click": {"handle": key("help.licences")}})).unwrap();
h.frames(2);
let left = |id: &str| solidcraft_ui_registry::rect_of(&key(id)).map(|r| r.left());
let parent = left("help.licences").expect("the Licences heading");
assert_eq!(left("help.fonts"), Some(parent), "Fonts stays beside Licences");
for child in ["help.notice", "help.mit", "help.apache", "help.third_party"] {
let x = left(child).unwrap_or_else(|| panic!("{child} is not shown"));
assert!(x >= parent + solidcraft_theme::Tokens::get().space_14 - 0.5, "{child} at {x}, Licences at {parent}");
}
}
#[test]
fn about_knows_its_build_and_diagnostics_say_where_it_runs() {
assert!(!COMMIT.is_empty() && BUILD_DATE.len() == 10, "{COMMIT} {BUILD_DATE}");