diff --git a/crates/eframe/src/epi/mod.rs b/crates/eframe/src/epi/mod.rs index b3ea9d3f9..06f7fe219 100644 --- a/crates/eframe/src/epi/mod.rs +++ b/crates/eframe/src/epi/mod.rs @@ -782,19 +782,6 @@ impl Frame { /// If this is the main window will return true! /// When is a single window mode will always return true! - pub fn is_main_window(&self) -> bool { - self.info.viewport_id == 0 - } - - /// Returns the current viewport id - pub fn viewport_id(&self) -> u64 { - self.info.viewport_id - } - - /// Returns the current viewport parent id - pub fn parent_viewport_id(&self) -> u64 { - self.info.parent_viewport - } /// A place where you can store custom data in a way that persists when you restart the app. pub fn storage(&self) -> Option<&dyn Storage> { @@ -1147,12 +1134,6 @@ pub struct IntegrationInfo { /// The OS native pixels-per-point pub native_pixels_per_point: Option, - /// This is the id of the current native window - /// If this is the same as `parent_viewport` that means that is the main window - pub viewport_id: u64, - /// This is the id of the current native window - pub parent_viewport: u64, - /// The position and size of the native window. #[cfg(not(target_arch = "wasm32"))] pub window_info: WindowInfo, diff --git a/crates/eframe/src/lib.rs b/crates/eframe/src/lib.rs index e682b537b..46d2c225d 100644 --- a/crates/eframe/src/lib.rs +++ b/crates/eframe/src/lib.rs @@ -279,10 +279,10 @@ pub fn run_simple_native( frame: &mut Frame, render_function: Option<&(dyn Fn(&egui::Context, u64, u64) + Send + Sync)>, ) { - if frame.is_main_window() { + if ctx.get_viewport_id() == 0 { (self.update_fun)(ctx, frame); } else if let Some(render_function) = render_function { - render_function(ctx, frame.viewport_id(), frame.parent_viewport_id()) + render_function(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()) } } } diff --git a/crates/eframe/src/native/epi_integration.rs b/crates/eframe/src/native/epi_integration.rs index 65237e7ed..2f2123a0d 100644 --- a/crates/eframe/src/native/epi_integration.rs +++ b/crates/eframe/src/native/epi_integration.rs @@ -369,8 +369,6 @@ impl EpiIntegration { cpu_usage: None, native_pixels_per_point: Some(native_pixels_per_point), window_info: read_window_info(window, egui_ctx.pixels_per_point(), &window_state), - viewport_id: 0, - parent_viewport: 0, }, output: epi::backend::AppOutput { visible: Some(true), @@ -511,8 +509,6 @@ impl EpiIntegration { read_window_info(window, self.egui_ctx.pixels_per_point(), &self.window_state); let mut raw_input = egui_winit.take_egui_input(window); raw_input.time = Some(self.beagining.elapsed().as_secs_f64()); - self.frame.info.viewport_id = viewport_id; - self.frame.info.parent_viewport = parent_id; // Run user code: let full_output = self diff --git a/crates/egui_demo_app/src/apps/custom3d_glow.rs b/crates/egui_demo_app/src/apps/custom3d_glow.rs index d1bddc736..4cef4a536 100644 --- a/crates/egui_demo_app/src/apps/custom3d_glow.rs +++ b/crates/egui_demo_app/src/apps/custom3d_glow.rs @@ -24,11 +24,11 @@ impl eframe::App for Custom3d { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { diff --git a/crates/egui_demo_app/src/wrap_app.rs b/crates/egui_demo_app/src/wrap_app.rs index d068b2a40..89b71d3d8 100644 --- a/crates/egui_demo_app/src/wrap_app.rs +++ b/crates/egui_demo_app/src/wrap_app.rs @@ -18,11 +18,11 @@ impl eframe::App for EasyMarkApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } self.editor.panels(ctx); @@ -41,11 +41,11 @@ impl eframe::App for DemoApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } self.demo_windows.ui(ctx); @@ -64,11 +64,11 @@ impl eframe::App for FractalClockApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default() @@ -96,7 +96,7 @@ impl eframe::App for ColorTestApp { render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { @@ -271,7 +271,7 @@ impl eframe::App for WrapApp { render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } #[cfg(target_arch = "wasm32")] diff --git a/examples/confirm_exit/src/main.rs b/examples/confirm_exit/src/main.rs index 320d3f378..7494e2b86 100644 --- a/examples/confirm_exit/src/main.rs +++ b/examples/confirm_exit/src/main.rs @@ -41,7 +41,7 @@ impl eframe::App for MyApp { render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { diff --git a/examples/custom_3d_glow/src/main.rs b/examples/custom_3d_glow/src/main.rs index b92f1faf4..34de52ef9 100644 --- a/examples/custom_3d_glow/src/main.rs +++ b/examples/custom_3d_glow/src/main.rs @@ -44,11 +44,11 @@ impl eframe::App for MyApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { diff --git a/examples/custom_font/src/main.rs b/examples/custom_font/src/main.rs index 4861ade24..5bd345fd0 100644 --- a/examples/custom_font/src/main.rs +++ b/examples/custom_font/src/main.rs @@ -63,11 +63,11 @@ impl eframe::App for MyApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { diff --git a/examples/custom_font_style/src/main.rs b/examples/custom_font_style/src/main.rs index b44775e3c..9e7f2f421 100644 --- a/examples/custom_font_style/src/main.rs +++ b/examples/custom_font_style/src/main.rs @@ -67,11 +67,11 @@ impl eframe::App for MyApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, content); diff --git a/examples/custom_window_frame/src/main.rs b/examples/custom_window_frame/src/main.rs index 352269e17..ebd6d63fb 100644 --- a/examples/custom_window_frame/src/main.rs +++ b/examples/custom_window_frame/src/main.rs @@ -37,7 +37,7 @@ impl eframe::App for MyApp { render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } custom_window_frame(ctx, frame, "egui with custom frame", |ui| { diff --git a/examples/download_image/src/main.rs b/examples/download_image/src/main.rs index 77ac52c81..c2b940967 100644 --- a/examples/download_image/src/main.rs +++ b/examples/download_image/src/main.rs @@ -24,11 +24,11 @@ impl eframe::App for MyApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } let promise = self.promise.get_or_insert_with(|| { diff --git a/examples/file_dialog/src/main.rs b/examples/file_dialog/src/main.rs index 81c843549..b1288ad76 100644 --- a/examples/file_dialog/src/main.rs +++ b/examples/file_dialog/src/main.rs @@ -26,11 +26,11 @@ impl eframe::App for MyApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { diff --git a/examples/hello_world/src/main.rs b/examples/hello_world/src/main.rs index f27b4870a..70a8724dc 100644 --- a/examples/hello_world/src/main.rs +++ b/examples/hello_world/src/main.rs @@ -33,11 +33,11 @@ impl eframe::App for MyApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { diff --git a/examples/hello_world_par/src/main.rs b/examples/hello_world_par/src/main.rs index 6e2634191..f1b92d7b9 100644 --- a/examples/hello_world_par/src/main.rs +++ b/examples/hello_world_par/src/main.rs @@ -139,11 +139,11 @@ impl eframe::App for MyApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } let data = self.data.clone(); diff --git a/examples/keyboard_events/src/main.rs b/examples/keyboard_events/src/main.rs index 648f7928c..983edf83f 100644 --- a/examples/keyboard_events/src/main.rs +++ b/examples/keyboard_events/src/main.rs @@ -22,11 +22,11 @@ impl eframe::App for Content { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { diff --git a/examples/puffin_profiler/src/main.rs b/examples/puffin_profiler/src/main.rs index 4dd7961f4..fbaa4d33c 100644 --- a/examples/puffin_profiler/src/main.rs +++ b/examples/puffin_profiler/src/main.rs @@ -20,11 +20,11 @@ impl eframe::App for MyApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { diff --git a/examples/retained_image/src/main.rs b/examples/retained_image/src/main.rs index 470fbf65a..785e5aebe 100644 --- a/examples/retained_image/src/main.rs +++ b/examples/retained_image/src/main.rs @@ -38,11 +38,11 @@ impl eframe::App for MyApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs index 0c124ff39..713124838 100644 --- a/examples/screenshot/src/main.rs +++ b/examples/screenshot/src/main.rs @@ -31,7 +31,7 @@ impl eframe::App for MyApp { render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { diff --git a/examples/serial_windows/src/main.rs b/examples/serial_windows/src/main.rs index b3c653f07..01621414a 100644 --- a/examples/serial_windows/src/main.rs +++ b/examples/serial_windows/src/main.rs @@ -53,7 +53,7 @@ impl eframe::App for MyApp { render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { diff --git a/examples/svg/src/main.rs b/examples/svg/src/main.rs index 18e2866ef..7037a0796 100644 --- a/examples/svg/src/main.rs +++ b/examples/svg/src/main.rs @@ -40,11 +40,11 @@ impl eframe::App for MyApp { fn update( &mut self, ctx: &egui::Context, - frame: &mut eframe::Frame, + _frame: &mut eframe::Frame, render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } egui::CentralPanel::default().show(ctx, |ui| { diff --git a/examples/user_attention/src/main.rs b/examples/user_attention/src/main.rs index 7a548c80e..7f92f9fae 100644 --- a/examples/user_attention/src/main.rs +++ b/examples/user_attention/src/main.rs @@ -61,7 +61,7 @@ impl eframe::App for Application { render: Option<&ViewportRender>, ) { if let Some(render) = render { - render(ctx, frame.viewport_id(), frame.parent_viewport_id()); + render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id()); return; } if let Some(request_at) = self.request_at {