djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[window] prevent trying to shrink window smaller than title bar width

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-08-28 16:07:20 +02:00
parent 5f919e22a9
commit 8c03f6a90f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
egui/src/containers/resize.rs
View file

@ -24,7 +24,7 @@ pub struct Resize {
/// If false, we are no enabled
resizable: bool,
min_size: Vec2,
pub(crate) min_size: Vec2,
default_size: Vec2,

6
egui/src/containers/window.rs
View file

@ -195,8 +195,7 @@ impl<'open> Window<'open> {
let area = area.movable(false); // We move it manually
let resize = resize.resizable(false); // We move it manually
let resize = resize.id(resize_id);
let mut resize = resize.id(resize_id);
let frame = frame.unwrap_or_else(|| Frame::window(&ctx.style()));
@ -253,6 +252,7 @@ impl<'open> Window<'open> {
&mut collapsing,
collapsible,
);
resize.min_size.x = resize.min_size.x.max(title_bar.rect.width()); // Prevent making window smaller than title bar width
let content_rect = collapsing
.add_contents(&mut frame.content_ui, |ui| {
@ -613,7 +613,7 @@ fn show_title_bar(
let title_rect = ui.allocate_space(title_galley.size);
if show_close_button {
// Reserve space for close button which will be added later:
// Reserve space for close button which will be added later (once we know our full width):
let close_max_x = title_rect.right() + item_spacing.x + button_size + item_spacing.x;
let close_max_x = close_max_x.max(ui.rect_finite().right());
let close_rect = Rect::from_min_size(