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

Improve panel sizing API

Browse source
This commit is contained in:
Emil Ernerfeldt 2022-10-28 10:04:54 +02:00
parent 1fadc7396a
commit da96fcacd3
1 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
crates/egui/src/containers/panel.rs
View file

@ -137,25 +137,37 @@ impl SidePanel {
/// The initial wrapping width of the [`SidePanel`]. /// The initial wrapping width of the [`SidePanel`].
pub fn default_width(mut self, default_width: f32) -> Self { pub fn default_width(mut self, default_width: f32) -> Self {
self.default_width = default_width; self.default_width = default_width;
self.width_range = self.width_range.start().at_most(default_width)
..=self.width_range.end().at_least(default_width);
self self
} }
/// Minimum width of the panel.
pub fn min_width(mut self, min_width: f32) -> Self { pub fn min_width(mut self, min_width: f32) -> Self {
self.width_range = min_width..=(*self.width_range.end()); self.width_range = min_width..=self.width_range.end().at_least(min_width);
self self
} }
/// Maximum width of the panel.
pub fn max_width(mut self, max_width: f32) -> Self { pub fn max_width(mut self, max_width: f32) -> Self {
self.width_range = (*self.width_range.start())..=max_width; self.width_range = self.width_range.start().at_most(max_width)..=max_width;
self self
} }
/// The allowable width range for resizable panels. /// The allowable width range for the panel.
pub fn width_range(mut self, width_range: RangeInclusive<f32>) -> Self { pub fn width_range(mut self, width_range: RangeInclusive<f32>) -> Self {
self.default_width = clamp_to_range(self.default_width, width_range.clone());
self.width_range = width_range; self.width_range = width_range;
self self
} }
/// Enforce this exact width.
pub fn exact_width(mut self, width: f32) -> Self {
self.default_width = width;
self.width_range = width..=width;
self
}
/// Change the background color, margins, etc. /// Change the background color, margins, etc.
pub fn frame(mut self, frame: Frame) -> Self { pub fn frame(mut self, frame: Frame) -> Self {
self.frame = Some(frame); self.frame = Some(frame);
@ -420,25 +432,39 @@ impl TopBottomPanel {
/// Defaults to [`style::Spacing::interact_size`].y. /// Defaults to [`style::Spacing::interact_size`].y.
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);
self.height_range = self.height_range.start().at_most(default_height)
..=self.height_range.end().at_least(default_height);
self self
} }
/// Minimum height of the panel.
pub fn min_height(mut self, min_height: f32) -> Self { pub fn min_height(mut self, min_height: f32) -> Self {
self.height_range = min_height..=(*self.height_range.end()); self.height_range = min_height..=self.height_range.end().at_least(min_height);
self self
} }
/// Maximum height of the panel.
pub fn max_height(mut self, max_height: f32) -> Self { pub fn max_height(mut self, max_height: f32) -> Self {
self.height_range = (*self.height_range.start())..=max_height; self.height_range = self.height_range.start().at_most(max_height)..=max_height;
self self
} }
/// The allowable height range for resizable panels. /// The allowable height range for the panel.
pub fn height_range(mut self, height_range: RangeInclusive<f32>) -> Self { pub fn height_range(mut self, height_range: RangeInclusive<f32>) -> Self {
self.default_height = self
.default_height
.map(|default_height| clamp_to_range(default_height, height_range.clone()));
self.height_range = height_range; self.height_range = height_range;
self self
} }
/// Enforce this exact height.
pub fn exact_height(mut self, height: f32) -> Self {
self.default_height = Some(height);
self.height_range = height..=height;
self
}
/// Change the background color, margins, etc. /// Change the background color, margins, etc.
pub fn frame(mut self, frame: Frame) -> Self { pub fn frame(mut self, frame: Frame) -> Self {
self.frame = Some(frame); self.frame = Some(frame);