skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix default height of top/bottom panels (#4779) 

The inner size is now `interactive_size.y`, like in 0.27.

* Closes https://github.com/emilk/egui/issues/4773
* Broke in https://github.com/emilk/egui/pull/4351

Thanks to @valadaptive for reporting and diagnosing the bug
This commit is contained in:
Emil Ernerfeldt 2024-07-04 11:05:43 +02:00 committed by GitHub
parent 042e1add41
commit b31d02dd21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/egui/src/containers/panel.rs
View File

@ -634,7 +634,7 @@ impl TopBottomPanel {
} }
/// The initial height of the [`TopBottomPanel`], including margins. /// The initial height of the [`TopBottomPanel`], including margins.
/// Defaults to [`style::Spacing::interact_size`].y. /// Defaults to [`style::Spacing::interact_size`].y, plus frame margins.
#[inline] #[inline]
pub fn default_height(mut self, default_height: f32) -> Self { pub fn default_height(mut self, default_height: f32) -> Self {
self.default_height = Some(default_height); self.default_height = Some(default_height);
@ -712,13 +712,16 @@ impl TopBottomPanel {
height_range, height_range,
} = self; } = self;
let frame = frame.unwrap_or_else(|| Frame::side_top_panel(ui.style()));
let available_rect = ui.available_rect_before_wrap(); let available_rect = ui.available_rect_before_wrap();
let mut panel_rect = available_rect; let mut panel_rect = available_rect;
let mut height = if let Some(state) = PanelState::load(ui.ctx(), id) { let mut height = if let Some(state) = PanelState::load(ui.ctx(), id) {
state.rect.height() state.rect.height()
} else { } else {
default_height.unwrap_or_else(|| ui.style().spacing.interact_size.y) default_height
.unwrap_or_else(|| ui.style().spacing.interact_size.y + frame.inner_margin.sum().y)
}; };
{ {
height = clamp_to_range(height, height_range).at_most(available_rect.height()); height = clamp_to_range(height, height_range).at_most(available_rect.height());
@ -759,7 +762,6 @@ impl TopBottomPanel {
panel_ui.expand_to_include_rect(panel_rect); panel_ui.expand_to_include_rect(panel_rect);
panel_ui.set_clip_rect(panel_rect); // If we overflow, don't do so visibly (#4475) panel_ui.set_clip_rect(panel_rect); // If we overflow, don't do so visibly (#4475)
let frame = frame.unwrap_or_else(|| Frame::side_top_panel(ui.style()));
let inner_response = frame.show(&mut panel_ui, |ui| { let inner_response = frame.show(&mut panel_ui, |ui| {
ui.set_min_width(ui.max_rect().width()); // Make the frame fill full width ui.set_min_width(ui.max_rect().width()); // Make the frame fill full width
ui.set_min_height((height_range.min - frame.inner_margin.sum().y).at_least(0.0)); ui.set_min_height((height_range.min - frame.inner_margin.sum().y).at_least(0.0));