aleleba/gridcraft
1
0
Fork 0
mirror of https://github.com/storytold/gridcraft.git synced 2026-10-25 11:16:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improved font dropdown row sizing and scroll alignment

Browse Source
This commit is contained in:
Mario
2026-10-15 01:15:15 +02:00
parent 50f8c0d42b
commit f9802ecc9d
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/ribbon.rs
+14 -5
View File
@@ -459,9 +459,18 @@ pub(crate) fn editable_combo(
}
}
ui.separator();
let row_h = 20.0 + ui.spacing().item_spacing.y;
let content_h = filtered.len() as f32 * row_h + 4.0;
let desired_h = content_h.min(240.0);
let button_h = ui.spacing().interact_size.y.max(20.0);
let spacing = ui.spacing().item_spacing.y;
let n = filtered.len() as f32;
let content_h = n * button_h + (n - 1.0).max(0.0) * spacing;
let max_rows = 9.0_f32;
let max_h = max_rows * button_h + (max_rows - 1.0) * spacing;
let desired_h = content_h.min(max_h);
ui.set_min_height(desired_h);
egui::ScrollArea::vertical().max_height(desired_h).show(ui, |ui| {
@@ -470,8 +479,8 @@ pub(crate) fn editable_combo(
let row = ui.add(egui::Button::selectable(pos as i32 == st.sel, egui::RichText::new(disp)).min_size(vec2(220.0, 20.0)));
if (down || up) && pos as i32 == st.sel {
row.scroll_to_me(None);
if (down || up) && pos as i32 == st.sel && !ui.clip_rect().contains_rect(row.rect) {
row.scroll_to_me(Some(if down { egui::Align::Max } else { egui::Align::Min }));
}
if row.clicked() {