migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 05:40: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 16:19:41 +03:00
parent 155d48abd1 707ca04c08
commit e44c2e6928
17 changed files with 168 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/eframe/Cargo.toml
View File

@@ -96,6 +96,8 @@ egui = { version = "0.22.0", path = "../egui", default-features = false, feature
"log",
] }
log = { version = "0.4", features = ["std"] }
parking_lot = "0.12"
static_assertions = "1.1.0"
thiserror.workspace = true
#! ### Optional dependencies
@@ -106,7 +108,6 @@ egui_glow = { version = "0.22.0", path = "../egui_glow", optional = true, defaul
glow = { version = "0.12", optional = true }
ron = { version = "0.8", optional = true, features = ["integer128"] }
serde = { version = "1", optional = true, features = ["derive"] }
static_assertions = "1.1.0"
# -------------------------------------------
# native:

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

@@ -1771,6 +1771,7 @@ mod wgpu_integration {
use egui::ViewportRender;
use egui_winit::create_winit_window_builder;
use parking_lot::Mutex;
use super::*;
@@ -1830,7 +1831,7 @@ mod wgpu_integration {
}
struct WgpuWinitApp {
repaint_proxy: Arc<std::sync::Mutex<EventLoopProxy<UserEvent>>>,
repaint_proxy: Arc<Mutex<EventLoopProxy<UserEvent>>>,
app_name: String,
native_options: epi::NativeOptions,
app_creator: Option<epi::AppCreator>,
@@ -1855,7 +1856,7 @@ mod wgpu_integration {
);
Self {
repaint_proxy: Arc::new(std::sync::Mutex::new(event_loop.create_proxy())),
repaint_proxy: Arc::new(Mutex::new(event_loop.create_proxy())),
app_name: app_name.to_owned(),
native_options,
running: None,
@@ -1983,11 +1984,7 @@ mod wgpu_integration {
let mut state = egui_winit::State::new(event_loop);
#[cfg(feature = "accesskit")]
{
integration.init_accesskit(
&mut state,
&window,
self.repaint_proxy.lock().unwrap().clone(),
);
integration.init_accesskit(&mut state, &window, self.repaint_proxy.lock().clone());
}
let theme = system_theme.unwrap_or(self.native_options.default_theme);
integration.egui_ctx.set_visuals(theme.egui_visuals());
@@ -2006,7 +2003,6 @@ mod wgpu_integration {
event_loop_proxy
.lock()
.unwrap()
.send_event(UserEvent::RequestRepaint {
when,
frame_nr,