migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00
Code Activity

[egui_glium] Add option not to persist app to file

Browse Source
This commit is contained in:
Emil Ernerfeldt
2020-10-19 20:25:05 +02:00
parent 43813a71eb
commit 8ccc36937f
5 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
egui_glium/src/backend.rs
View File

@@ -1,9 +1,6 @@
use std::time::Instant;
use crate::{
storage::{FileStorage, WindowSettings},
*,
};
use crate::{storage::WindowSettings, *};
pub use egui::{
app::{self, App, Storage},
@@ -24,7 +21,11 @@ impl egui::app::TextureAllocator for Painter {
}
/// Run an egui app
pub fn run(title: &str, mut storage: FileStorage, mut app: impl App + 'static) -> ! {
pub fn run(
title: &str,
mut storage: Box<dyn egui::app::Storage>,
mut app: impl App + 'static,
) -> ! {
let event_loop = glutin::event_loop::EventLoop::new();
let mut window = glutin::window::WindowBuilder::new()
.with_decorations(true)
@@ -32,7 +33,8 @@ pub fn run(title: &str, mut storage: FileStorage, mut app: impl App + 'static) -
.with_title(title)
.with_transparent(false);
let window_settings: Option<WindowSettings> = egui::app::get_value(&storage, WINDOW_KEY);
let window_settings: Option<WindowSettings> =
egui::app::get_value(storage.as_ref(), WINDOW_KEY);
if let Some(window_settings) = &window_settings {
window = window_settings.initialize_size(window);
}
@@ -49,7 +51,7 @@ pub fn run(title: &str, mut storage: FileStorage, mut app: impl App + 'static) -
}
let mut ctx = egui::Context::new();
*ctx.memory() = egui::app::get_value(&storage, EGUI_MEMORY_KEY).unwrap_or_default();
*ctx.memory() = egui::app::get_value(storage.as_ref(), EGUI_MEMORY_KEY).unwrap_or_default();
let mut raw_input = egui::RawInput {
pixels_per_point: Some(native_pixels_per_point(&display)),
@@ -119,13 +121,13 @@ pub fn run(title: &str, mut storage: FileStorage, mut app: impl App + 'static) -
}
glutin::event::Event::LoopDestroyed => {
egui::app::set_value(
&mut storage,
storage.as_mut(),
WINDOW_KEY,
&WindowSettings::from_display(&display),
);
egui::app::set_value(&mut storage, EGUI_MEMORY_KEY, &*ctx.memory());
app.on_exit(&mut storage);
storage.save();
egui::app::set_value(storage.as_mut(), EGUI_MEMORY_KEY, &*ctx.memory());
app.on_exit(storage.as_mut());
storage.flush();
}
_ => (),
}