migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 05:10:03 -04:00
Code Activity

Merge branch 'master' of https://github.com/emilk/egui into multiples_viewports

Browse Source
This commit is contained in:
Konkitoman
2023-09-05 12:19:02 +03:00
parent 12eeda0a3f 46ea72abe4
commit f30bf519ee
20 changed files with 614 additions and 190 deletions
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.
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.

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

@@ -1003,7 +1003,7 @@ mod glow_integration {
let window = &mut *window.write();
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")]
@@ -2020,7 +2020,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,