migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 14:20:04 -04:00
Code Activity

Properly respect min_size in TextEdit (#8420)

Browse Source 
TextEdit has a min_size field but we completely ignored in the y
direciton. (I probably broke it in #7140).

---------

Co-authored-by: emilk <1148717+emilk@users.noreply.github.com>
This commit is contained in:
Lucas Meurer
2026-09-01 11:39:32 +02:00
committed by GitHub
parent de077b92d3
commit e1507d031d
19 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/egui/src/widgets/text_edit/builder.rs
View File

@@ -478,7 +478,8 @@ impl TextEdit<'_> {
let desired_width = desired_width
.unwrap_or_else(|| ui.spacing().text_edit_width)
.at_least(min_size.x);
let allocate_width = desired_width.at_most(available_width);
// `min_size` overrides available width
let allocate_width = desired_width.at_most(available_width).at_least(min_size.x);
let font_id_clone = font_id.clone();
let mut default_layouter = move |ui: &Ui, text: &dyn TextBuffer, wrap_width: f32| {
@@ -695,7 +696,7 @@ impl TextEdit<'_> {
let custom_frame = frame.is_some();
let frame = frame.unwrap_or_else(|| Frame::new().inner_margin(margin));
let min_height = min_inner_height + frame.total_margin().sum().y;
let min_height = (min_inner_height + frame.total_margin().sum().y).at_least(min_size.y);
// This wrap mode only affects the hint_text
let wrap_mode = if multiline {