Skip to content

Commit 50af77e

Browse files
authored
Update egui to 0.35 (#250)
1 parent db52cb0 commit 50af77e

40 files changed

Lines changed: 985 additions & 711 deletions

Cargo.lock

Lines changed: 904 additions & 630 deletions
Large diffs are not rendered by default.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ ahash = { version = "0.8.12", default-features = false, features = [
5252
] }
5353
assertables = "9.8.2"
5454
document-features = "0.2.12"
55-
eframe = { version = "0.34.0", default-features = false }
56-
egui = { version = "0.34.0", default-features = false }
57-
egui_kittest = { version = "0.34.0", default-features = false }
58-
emath = { version = "0.34.0", default-features = false }
55+
eframe = { version = "0.35.0", default-features = false }
56+
egui = { version = "0.35.0", default-features = false }
57+
egui_kittest = { version = "0.35.0", default-features = false }
58+
emath = { version = "0.35.0", default-features = false }
5959
env_logger = { version = "0.11.8", default-features = false, features = [
6060
"auto-color",
6161
"humantime",

demo/src/app.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl DemoGallery {
7070
}
7171

7272
fn top_bar(ui: &mut egui::Ui) {
73-
egui::Panel::top("top_panel").show_inside(ui, |ui| {
73+
egui::Panel::top("top_panel").show(ui, |ui| {
7474
egui::MenuBar::new().ui(ui, |ui| {
7575
egui::widgets::global_theme_preference_buttons(ui);
7676

@@ -89,7 +89,7 @@ impl DemoGallery {
8989
// TODO(#193): get rid of "extra space" calc.
9090
.max_size(Self::COL_WIDTH * 3. + 30.)
9191
.resizable(true)
92-
.show_inside(ui, |ui| {
92+
.show(ui, |ui| {
9393
ScrollArea::vertical().show(ui, |ui| {
9494
let available_width = ui.available_width();
9595
let num_columns = 1.max((available_width / Self::COL_WIDTH).floor() as usize);
@@ -115,7 +115,7 @@ impl DemoGallery {
115115
egui::Panel::right("info_panel")
116116
.resizable(true)
117117
.default_size(600.0)
118-
.show_inside(ui, |ui| {
118+
.show(ui, |ui| {
119119
let example = &mut self.examples[index];
120120
ui.label(RichText::new(example.title()).heading());
121121
ui.separator();
@@ -150,7 +150,7 @@ impl DemoGallery {
150150
}
151151

152152
fn demo_panel(&mut self, ui: &mut egui::Ui) {
153-
egui::CentralPanel::default().show_inside(ui, |ui| {
153+
egui::CentralPanel::default().show(ui, |ui| {
154154
if let Some(index) = self.current_example {
155155
ui.vertical(|ui| {
156156
self.examples[index].show_controls(ui);

egui_plot/src/plot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ pub struct Plot<'a> {
138138

139139
impl<'a> Plot<'a> {
140140
/// Give a unique id for each plot within the same [`Ui`].
141-
pub fn new(id_source: impl std::hash::Hash) -> Self {
141+
pub fn new(id_source: impl egui::AsId) -> Self {
142142
Self {
143143
id_source: Id::new(id_source),
144144
id: None,
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

examples/box_plot/screenshot.png

Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)