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

Fix windows and android errors

Browse Source
This commit is contained in:
Konkitoman
2023-08-22 11:20:34 +03:00
parent 8e864bdfbc
commit 7aefba60df
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1858,8 +1858,8 @@ mod wgpu_integration {
#[cfg(target_os = "android")] #[cfg(target_os = "android")]
fn drop_window(&mut self) -> std::result::Result<(), egui_wgpu::WgpuError> { fn drop_window(&mut self) -> std::result::Result<(), egui_wgpu::WgpuError> {
if let Some(running) = &mut self.running { if let Some(running) = &mut self.running {
running.windows.remove(&0); running.windows.write().remove(&ViewportId::MAIN);
pollster::block_on(running.painter.set_window(None))?; pollster::block_on(running.painter.write().set_window(ViewportId::MAIN, None))?;
} }
Ok(()) Ok(())
} }

2
crates/egui-winit/src/lib.rs
View File

@@ -1124,7 +1124,7 @@ pub fn create_winit_window_builder(builder: &ViewportBuilder) -> winit::window::
} }
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
if let Some(drag_and_drop) = builder.drag_and_drop { if let Some(enable) = builder.drag_and_drop {
use winit::platform::windows::WindowBuilderExtWindows as _; use winit::platform::windows::WindowBuilderExtWindows as _;
window_builder = window_builder.with_drag_and_drop(enable); window_builder = window_builder.with_drag_and_drop(enable);
} }