Skip to content

Commit

Permalink
Fix Panel incorrect size (#4351)
Browse files Browse the repository at this point in the history
<!--
Please read the "Making a PR" section of
[`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md)
before opening a Pull Request!

* Keep your PR:s small and focused.
* The PR title is what ends up in the changelog, so make it descriptive!
* If applicable, add a screenshot or gif.
* If it is a non-trivial addition, consider adding a demo for it to
`egui_demo_lib`, or a new example.
* Do NOT open PR:s from your `master` branch, as that makes it hard for
maintainers to add commits to your PR.
* Remember to run `cargo fmt` and `cargo cranky`.
* Open the PR as a draft until you have self-reviewed it and run
`./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.

Please be patient! I will review your PR, but my time is limited!
-->

* Closes <#4126>
* Closes <#3006>

Previously, `SidePanel`/`TopBottomPanel` didn't include `inner_margin`
when setting the min width/height of `Frame`. As a result, when your
`Panel` has `inner_margin`, its size doesn't work as expected.

Before


![before](https://github.com/emilk/egui/assets/62168376/3bd20c0a-6625-4786-9f7d-85449a0e436c)

After


![after](https://github.com/emilk/egui/assets/62168376/a2e41ed4-4f20-484c-8b54-d2ce9cc71d95)
  • Loading branch information
zhatuokun authored Apr 22, 2024
1 parent a2f1ca3 commit 587bc20
Showing 1 changed file with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions crates/egui/src/containers/panel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ impl SidePanel {
self
}

/// The initial wrapping width of the [`SidePanel`].
/// The initial wrapping width of the [`SidePanel`], including margins.
#[inline]
pub fn default_width(mut self, default_width: f32) -> Self {
self.default_width = default_width;
Expand All @@ -161,21 +161,21 @@ impl SidePanel {
self
}

/// Minimum width of the panel.
/// Minimum width of the panel, including margins.
#[inline]
pub fn min_width(mut self, min_width: f32) -> Self {
self.width_range = Rangef::new(min_width, self.width_range.max.at_least(min_width));
self
}

/// Maximum width of the panel.
/// Maximum width of the panel, including margins.
#[inline]
pub fn max_width(mut self, max_width: f32) -> Self {
self.width_range = Rangef::new(self.width_range.min.at_most(max_width), max_width);
self
}

/// The allowable width range for the panel.
/// The allowable width range for the panel, including margins.
#[inline]
pub fn width_range(mut self, width_range: impl Into<Rangef>) -> Self {
let width_range = width_range.into();
Expand All @@ -184,7 +184,7 @@ impl SidePanel {
self
}

/// Enforce this exact width.
/// Enforce this exact width, including margins.
#[inline]
pub fn exact_width(mut self, width: f32) -> Self {
self.default_width = width;
Expand Down Expand Up @@ -262,7 +262,9 @@ impl SidePanel {
let frame = frame.unwrap_or_else(|| Frame::side_top_panel(ui.style()));
let inner_response = frame.show(&mut panel_ui, |ui| {
ui.set_min_height(ui.max_rect().height()); // Make sure the frame fills the full height
ui.set_min_width(width_range.min);
ui.set_min_width(
width_range.min - (frame.inner_margin.left + frame.inner_margin.right),
);
add_contents(ui)
});

Expand Down Expand Up @@ -609,7 +611,7 @@ impl TopBottomPanel {
self
}

/// The initial height of the [`TopBottomPanel`].
/// The initial height of the [`TopBottomPanel`], including margins.
/// Defaults to [`style::Spacing::interact_size`].y.
#[inline]
pub fn default_height(mut self, default_height: f32) -> Self {
Expand All @@ -621,21 +623,21 @@ impl TopBottomPanel {
self
}

/// Minimum height of the panel.
/// Minimum height of the panel, including margins.
#[inline]
pub fn min_height(mut self, min_height: f32) -> Self {
self.height_range = Rangef::new(min_height, self.height_range.max.at_least(min_height));
self
}

/// Maximum height of the panel.
/// Maximum height of the panel, including margins.
#[inline]
pub fn max_height(mut self, max_height: f32) -> Self {
self.height_range = Rangef::new(self.height_range.min.at_most(max_height), max_height);
self
}

/// The allowable height range for the panel.
/// The allowable height range for the panel, including margins.
#[inline]
pub fn height_range(mut self, height_range: impl Into<Rangef>) -> Self {
let height_range = height_range.into();
Expand All @@ -646,7 +648,7 @@ impl TopBottomPanel {
self
}

/// Enforce this exact height.
/// Enforce this exact height, including margins.
#[inline]
pub fn exact_height(mut self, height: f32) -> Self {
self.default_height = Some(height);
Expand Down Expand Up @@ -728,7 +730,9 @@ impl TopBottomPanel {
let frame = frame.unwrap_or_else(|| Frame::side_top_panel(ui.style()));
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_height(height_range.min);
ui.set_min_height(
height_range.min - (frame.inner_margin.top + frame.inner_margin.bottom),
);
add_contents(ui)
});

Expand Down

0 comments on commit 587bc20

Please sign in to comment.