From 67c192bfb3f7681104c7a26a26f59f3579bf77d3 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Tue, 14 Nov 2023 06:47:09 +0100
Subject: [PATCH] Simplify render_immediate_viewport

---
 crates/eframe/src/native/run.rs | 38 +++++++++++++++++----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs
index 5b6992cf8fa..6725efe688f 100644
--- a/crates/eframe/src/native/run.rs
+++ b/crates/eframe/src/native/run.rs
@@ -2146,29 +2146,25 @@ mod wgpu_integration {
                 viewport_maps,
             } = &mut *shared;
 
-            // Creating a new native window if is needed
-            if !viewports.contains_key(&ids.this) {
-                if builder.icon.is_none() {
-                    builder.icon = viewports
-                        .get(&ids.parent)
-                        .and_then(|vp| vp.builder.icon.clone());
-                }
+            if builder.icon.is_none() {
+                // Inherit icon from parent
+                builder.icon = viewports
+                    .get(&ids.parent)
+                    .and_then(|vp| vp.builder.icon.clone());
+            }
 
-                let viewport = viewports.entry(ids.this).or_insert(Viewport {
-                    ids,
-                    builder,
-                    viewport_ui_cb: None,
-                    window: None,
-                    egui_winit: None,
-                });
+            let viewport = viewports.entry(ids.this).or_insert(Viewport {
+                ids,
+                builder,
+                viewport_ui_cb: None,
+                window: None,
+                egui_winit: None,
+            });
 
+            if viewport.window.is_none() {
                 viewport.init_window(viewport_maps, painter, event_loop);
             }
 
-            // Render sync viewport:
-            let Some(viewport) = viewports.get_mut(&ids.this) else {
-                return;
-            };
             let Some(winit_state) = &mut viewport.egui_winit else {
                 return;
             };
@@ -2756,6 +2752,7 @@ mod wgpu_integration {
         match viewports.entry(ids.this) {
             std::collections::hash_map::Entry::Vacant(entry) => {
                 // New viewport:
+                log::debug!("Creating new viewport {:?} ({:?})", ids.this, builder.title);
                 entry.insert(Viewport {
                     ids,
                     builder,
@@ -2775,6 +2772,11 @@ mod wgpu_integration {
                 let (commands, recreate) = viewport.builder.patch(&builder);
 
                 if recreate {
+                    log::debug!(
+                        "Recreating window for viewport {:?} ({:?})",
+                        ids.this,
+                        builder.title
+                    );
                     viewport.window = None;
                     viewport.egui_winit = None;
                 } else if let Some(window) = &viewport.window {