From 1b8e8cb38e109c8a9b44800f97f91999fae1ef81 Mon Sep 17 00:00:00 2001 From: Barugon <16503728+Barugon@users.noreply.github.com> Date: Tue, 5 Sep 2023 01:43:39 -0700 Subject: [PATCH] `eframe::Frame::info` returns a reference (#3301) * Get a reference to `IntegrationInfo` * Add doc comment * Change `info` to return a reference * Clone integration info * Remove `&` * Clone integration info in another place --- crates/eframe/src/epi/mod.rs | 4 ++-- crates/eframe/src/native/run.rs | 4 ++-- crates/egui_demo_app/src/backend_panel.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/eframe/src/epi/mod.rs b/crates/eframe/src/epi/mod.rs index 85433e7a..597a9122 100644 --- a/crates/eframe/src/epi/mod.rs +++ b/crates/eframe/src/epi/mod.rs @@ -762,8 +762,8 @@ impl Frame { } /// Information about the integration. - pub fn info(&self) -> IntegrationInfo { - self.info.clone() + pub fn info(&self) -> &IntegrationInfo { + &self.info } /// A place where you can store custom data in a way that persists when you restart the app. diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs index c1db4492..6a315d1a 100644 --- a/crates/eframe/src/native/run.rs +++ b/crates/eframe/src/native/run.rs @@ -768,7 +768,7 @@ mod glow_integration { .expect("Single-use AppCreator has unexpectedly already been taken"); let mut app = app_creator(&epi::CreationContext { egui_ctx: integration.egui_ctx.clone(), - integration_info: integration.frame.info(), + integration_info: integration.frame.info().clone(), storage: integration.frame.storage(), gl: Some(gl.clone()), #[cfg(feature = "wgpu")] @@ -1242,7 +1242,7 @@ mod wgpu_integration { .expect("Single-use AppCreator has unexpectedly already been taken"); let mut app = app_creator(&epi::CreationContext { egui_ctx: integration.egui_ctx.clone(), - integration_info: integration.frame.info(), + integration_info: integration.frame.info().clone(), storage: integration.frame.storage(), #[cfg(feature = "glow")] gl: None, diff --git a/crates/egui_demo_app/src/backend_panel.rs b/crates/egui_demo_app/src/backend_panel.rs index 6480756f..a8222aff 100644 --- a/crates/egui_demo_app/src/backend_panel.rs +++ b/crates/egui_demo_app/src/backend_panel.rs @@ -155,7 +155,7 @@ impl BackendPanel { // On web, the browser controls `pixels_per_point`. let integration_controls_pixels_per_point = frame.is_web(); if !integration_controls_pixels_per_point { - self.pixels_per_point_ui(ui, &frame.info()); + self.pixels_per_point_ui(ui, frame.info()); } #[cfg(not(target_arch = "wasm32"))]