migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 14:20:04 -04:00
Code Activity

Build fix

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-11-13 19:18:39 +01:00
parent 8195a82965
commit fdb7499933
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -488,7 +488,11 @@ mod glow_integration {
} }
impl GlowWinitRunning { impl GlowWinitRunning {
fn run_ui_and_paint(&mut self, window_id: WindowId) -> EventResult { fn run_ui_and_paint(
&mut self,
window_id: WindowId,
focused_viewport: Option<ViewportId>,
) -> EventResult {
let Some(viewport_id) = self let Some(viewport_id) = self
.glutin_ctx .glutin_ctx
.borrow() .borrow()
@@ -693,7 +697,7 @@ mod glow_integration {
for (viewport_id, command) in viewport_commands { for (viewport_id, command) in viewport_commands {
if let Some(viewport) = glutin.borrow().viewports.get(&viewport_id) { if let Some(viewport) = glutin.borrow().viewports.get(&viewport_id) {
if let Some(window) = &viewport.window { if let Some(window) = &viewport.window {
let is_viewport_focused = self.focused_viewport == Some(viewport_id); let is_viewport_focused = focused_viewport == Some(viewport_id);
egui_winit::process_viewport_commands( egui_winit::process_viewport_commands(
std::iter::once(command), std::iter::once(command),
window, window,
@@ -1629,7 +1633,7 @@ mod glow_integration {
fn run_ui_and_paint(&mut self, window_id: WindowId) -> EventResult { fn run_ui_and_paint(&mut self, window_id: WindowId) -> EventResult {
if let Some(running) = &mut self.running { if let Some(running) = &mut self.running {
running.run_ui_and_paint(window_id) running.run_ui_and_paint(window_id, self.focused_viewport)
} else { } else {
EventResult::Wait EventResult::Wait
} }