skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

`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
This commit is contained in:
Barugon 2023-09-05 01:43:39 -07:00 committed by GitHub
parent e3362dafac
commit 1b8e8cb38e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/eframe/src/epi/mod.rs
View File

@ -762,8 +762,8 @@ impl Frame {
} }
/// Information about the integration. /// Information about the integration.
pub fn info(&self) -> IntegrationInfo { pub fn info(&self) -> &IntegrationInfo {
self.info.clone() &self.info
} }
/// A place where you can store custom data in a way that persists when you restart the app. /// A place where you can store custom data in a way that persists when you restart the app.

4
crates/eframe/src/native/run.rs
View File

@ -768,7 +768,7 @@ mod glow_integration {
.expect("Single-use AppCreator has unexpectedly already been taken"); .expect("Single-use AppCreator has unexpectedly already been taken");
let mut app = app_creator(&epi::CreationContext { let mut app = app_creator(&epi::CreationContext {
egui_ctx: integration.egui_ctx.clone(), egui_ctx: integration.egui_ctx.clone(),
integration_info: integration.frame.info(), integration_info: integration.frame.info().clone(),
storage: integration.frame.storage(), storage: integration.frame.storage(),
gl: Some(gl.clone()), gl: Some(gl.clone()),
#[cfg(feature = "wgpu")] #[cfg(feature = "wgpu")]
@ -1242,7 +1242,7 @@ mod wgpu_integration {
.expect("Single-use AppCreator has unexpectedly already been taken"); .expect("Single-use AppCreator has unexpectedly already been taken");
let mut app = app_creator(&epi::CreationContext { let mut app = app_creator(&epi::CreationContext {
egui_ctx: integration.egui_ctx.clone(), egui_ctx: integration.egui_ctx.clone(),
integration_info: integration.frame.info(), integration_info: integration.frame.info().clone(),
storage: integration.frame.storage(), storage: integration.frame.storage(),
#[cfg(feature = "glow")] #[cfg(feature = "glow")]
gl: None, gl: None,

2
crates/egui_demo_app/src/backend_panel.rs
View File

@ -155,7 +155,7 @@ impl BackendPanel {
// On web, the browser controls `pixels_per_point`. // On web, the browser controls `pixels_per_point`.
let integration_controls_pixels_per_point = frame.is_web(); let integration_controls_pixels_per_point = frame.is_web();
if !integration_controls_pixels_per_point { 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"))] #[cfg(not(target_arch = "wasm32"))]