ai-space/craft-anything
3
0
Fork 0
mirror of https://github.com/storytold/craft-anything.git synced 2026-11-05 20:47:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

The Settings window keeps its width on every tab (#108)

Browse Source 
The Settings tab column takes exactly what's left of the window with room for the scroll bar, and a path field leaves room for its button, so the Engines tab no longer widens the window. Fixes #68.
This commit is contained in:
BFlat
2026-11-01 23:37:35 +07:00
committed by GitHub
parent d7281f25e1
commit 52b10bc5ba
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/settings_ui.rs
+8 -3
View File
@@ -86,10 +86,14 @@ pub fn show(app: &mut CraftApp, ctx: &egui::Context) {
});
ui.separator();
ui.vertical(|ui| {
ui.set_min_width(440.0);
// Exactly what's left of the window, with room for the scroll bar a long tab
// gets, so no tab can widen the window (#68).
let w = ui.available_width();
ui.set_width(w);
let content_w = w - ui.spacing().scroll.allocated_width();
// As tall as the window allows, so a tab's settings aren't cut off at the fold.
let h = (ctx.content_rect().height() - 220.0).clamp(280.0, 560.0);
egui::ScrollArea::vertical().min_scrolled_height(h).max_height(h).show(ui, |ui| match app.state.settings_tab {
egui::ScrollArea::vertical().min_scrolled_height(h).max_height(h).max_width(content_w).show(ui, |ui| match app.state.settings_tab {
SettingsTab::General => general(app, ui),
SettingsTab::Engines => engines(app, ui),
SettingsTab::Ai => ai(app, ui),
@@ -214,7 +218,8 @@ fn path_field(ui: &mut Ui, value: &mut Option<PathBuf>, name: &str, hint: &str)
let r = ui.add(
egui::TextEdit::singleline(&mut s)
.hint_text(tr(hint))
.desired_width(240.0)
// Up to 240, leaving room for a Choose… button after it, so a row never widens the window (#68).
.desired_width((ui.available_width() - 34.0).clamp(120.0, 240.0))
.font(theme::mono(12.0))
.frame(widgets::text_field_frame_compact(&Tokens::get(ui.ctx()))),
);
crates/ui-egui/tests/smoke.rs
+5
View File
@@ -925,9 +925,14 @@ fn settings_window_tabs_draw() {
a
});
h.run_steps(3);
// The window keeps its width on every tab: its close button (left of the title bar's) doesn't
// move (#68).
let edge = |h: &Harness<'static, CraftApp>| h.get_all_by_label("Close").map(|n| n.rect().right()).fold(f32::INFINITY, f32::min);
let right = edge(&h);
for tab in ["Engines", "AI", "Builds", "Plugins", "Safety", "General"] {
h.get_by_label(tab).click();
h.run_steps(2);
assert_eq!(edge(&h), right, "the Settings window changed width on {tab}");
}
h.get_by_label("Studio Light").click();
h.run_steps(3);