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

Deprecate left/centered/right column functions in Ui

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-12-19 11:14:59 +01:00
parent 1e1bfa4dc7
commit ea10add1cb
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -30,7 +30,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
* `egui::App`: added `fn name(&self)` and `fn clear_color(&self)`. * `egui::App`: added `fn name(&self)` and `fn clear_color(&self)`.
### Deprecated ### Deprecated
* Deprecated `RawInput::screen_size` - use `RawInput::screen_rect` instead. * `RawInput::screen_size` - use `RawInput::screen_rect` instead.
* left/centered/right column functions on `Ui`.
## 0.5.0 - 2020-12-13 ## 0.5.0 - 2020-12-13

8
egui/src/demos/fractal_clock.rs
View file

@ -58,17 +58,17 @@ impl FractalClock {
ui.available_rect_before_wrap_finite(), ui.available_rect_before_wrap_finite(),
); );
self.paint(&painter); self.paint(&painter);
// Make sure we allocate what we used (everything)
ui.expand_to_include_rect(painter.clip_rect());
Frame::popup(ui.style()) Frame::popup(ui.style())
.fill(Rgba::luminance_alpha(0.02, 0.5).into()) .fill(Rgba::luminance_alpha(0.02, 0.5).into())
.stroke(Stroke::none()) .stroke(Stroke::none())
.show(&mut ui.left_column(320.0), |ui| { .show(ui, |ui| {
ui.set_max_width(270.0);
CollapsingHeader::new("Settings") CollapsingHeader::new("Settings")
.show(ui, |ui| self.options_ui(ui, seconds_since_midnight)); .show(ui, |ui| self.options_ui(ui, seconds_since_midnight));
}); });
// Make sure we allocate what we used (everything)
ui.allocate_space(painter.clip_rect().size());
} }
fn options_ui(&mut self, ui: &mut Ui, seconds_since_midnight: Option<f64>) { fn options_ui(&mut self, ui: &mut Ui, seconds_since_midnight: Option<f64>) {

7
egui/src/ui.rs
View file

@ -834,19 +834,26 @@ impl Ui {
(ret, self.interact_hover(rect)) (ret, self.interact_hover(rect))
} }
#[deprecated]
pub fn left_column(&mut self, width: f32) -> Self { pub fn left_column(&mut self, width: f32) -> Self {
#[allow(deprecated)]
self.column(Align::Min, width) self.column(Align::Min, width)
} }
#[deprecated]
pub fn centered_column(&mut self, width: f32) -> Self { pub fn centered_column(&mut self, width: f32) -> Self {
#[allow(deprecated)]
self.column(Align::Center, width) self.column(Align::Center, width)
} }
#[deprecated]
pub fn right_column(&mut self, width: f32) -> Self { pub fn right_column(&mut self, width: f32) -> Self {
#[allow(deprecated)]
self.column(Align::Max, width) self.column(Align::Max, width)
} }
/// A column ui with a given width. /// A column ui with a given width.
#[deprecated]
pub fn column(&mut self, column_position: Align, width: f32) -> Self { pub fn column(&mut self, column_position: Align, width: f32) -> Self {
let x = match column_position { let x = match column_position {
Align::Min => 0.0, Align::Min => 0.0,