Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,534 changes: 904 additions & 630 deletions Cargo.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ ahash = { version = "0.8.12", default-features = false, features = [
] }
assertables = "9.8.2"
document-features = "0.2.12"
eframe = { version = "0.34.0", default-features = false }
egui = { version = "0.34.0", default-features = false }
egui_kittest = { version = "0.34.0", default-features = false }
emath = { version = "0.34.0", default-features = false }
eframe = { version = "0.35.0", default-features = false }
egui = { version = "0.35.0", default-features = false }
egui_kittest = { version = "0.35.0", default-features = false }
emath = { version = "0.35.0", default-features = false }
env_logger = { version = "0.11.8", default-features = false, features = [
"auto-color",
"humantime",
Expand Down
8 changes: 4 additions & 4 deletions demo/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ impl DemoGallery {
}

fn top_bar(ui: &mut egui::Ui) {
egui::Panel::top("top_panel").show_inside(ui, |ui| {
egui::Panel::top("top_panel").show(ui, |ui| {
egui::MenuBar::new().ui(ui, |ui| {
egui::widgets::global_theme_preference_buttons(ui);

Expand All @@ -89,7 +89,7 @@ impl DemoGallery {
// TODO(#193): get rid of "extra space" calc.
.max_size(Self::COL_WIDTH * 3. + 30.)
.resizable(true)
.show_inside(ui, |ui| {
.show(ui, |ui| {
ScrollArea::vertical().show(ui, |ui| {
let available_width = ui.available_width();
let num_columns = 1.max((available_width / Self::COL_WIDTH).floor() as usize);
Expand All @@ -115,7 +115,7 @@ impl DemoGallery {
egui::Panel::right("info_panel")
.resizable(true)
.default_size(600.0)
.show_inside(ui, |ui| {
.show(ui, |ui| {
let example = &mut self.examples[index];
ui.label(RichText::new(example.title()).heading());
ui.separator();
Expand Down Expand Up @@ -150,7 +150,7 @@ impl DemoGallery {
}

fn demo_panel(&mut self, ui: &mut egui::Ui) {
egui::CentralPanel::default().show_inside(ui, |ui| {
egui::CentralPanel::default().show(ui, |ui| {
if let Some(index) = self.current_example {
ui.vertical(|ui| {
self.examples[index].show_controls(ui);
Expand Down
2 changes: 1 addition & 1 deletion egui_plot/src/plot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ pub struct Plot<'a> {

impl<'a> Plot<'a> {
/// Give a unique id for each plot within the same [`Ui`].
pub fn new(id_source: impl std::hash::Hash) -> Self {
pub fn new(id_source: impl egui::AsId) -> Self {
Self {
id_source: Id::new(id_source),
id: None,
Expand Down
4 changes: 2 additions & 2 deletions examples/borrow_points/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/borrow_points/screenshot_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/box_plot/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/box_plot/screenshot_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/custom_axes/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/custom_axes/screenshot_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/custom_plot_manipulation/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/custom_plot_manipulation/screenshot_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/filled_area/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/filled_area/screenshot_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/heatmap/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/heatmap/screenshot_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/histogram/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/histogram/screenshot_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/interaction/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/interaction/screenshot_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/items/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/items/screenshot_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/legend/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/legend/screenshot_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/legend_sort/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/legend_sort/screenshot_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/lines/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/lines/screenshot_thumb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/linked_axes/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions examples/markers/screenshot.png
4 changes: 2 additions & 2 deletions examples/markers/screenshot_thumb.png
4 changes: 2 additions & 2 deletions examples/performance/screenshot.png
4 changes: 2 additions & 2 deletions examples/performance/screenshot_thumb.png
4 changes: 2 additions & 2 deletions examples/plot_span/screenshot.png
4 changes: 2 additions & 2 deletions examples/plot_span/screenshot_thumb.png
4 changes: 2 additions & 2 deletions examples/save_plot/screenshot.png
4 changes: 2 additions & 2 deletions examples/save_plot/screenshot_thumb.png
4 changes: 2 additions & 2 deletions examples/stacked_bar/screenshot.png
4 changes: 2 additions & 2 deletions examples/stacked_bar/screenshot_thumb.png
4 changes: 2 additions & 2 deletions examples_utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub mod internal {

pub fn run_screenshot_test<State>(builder: impl Fn(&mut eframe::CreationContext<'_>) -> State, manifest_dir: &str)
where
State: eframe::App,
State: eframe::App + 'static,
{
let output_path = PathBuf::from(manifest_dir);
let options = SnapshotOptions::new()
Expand Down Expand Up @@ -89,7 +89,7 @@ macro_rules! make_main {

impl eframe::App for AppWrapper {
fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
egui::CentralPanel::default().show_inside(ui, |ui| {
egui::CentralPanel::default().show(ui, |ui| {
if self.plot_only {
self.inner.show_plot(ui);
} else {
Expand Down
Loading