1
0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00

Removed viewport_id and parent_viewport_id from eframe::Frame

This commit is contained in:
Konkitoman
2023-08-04 09:10:01 +03:00
parent d1b00b6fdc
commit e8027b3c3a
21 changed files with 39 additions and 62 deletions

View File

@@ -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| {

View File

@@ -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")]