1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 05:10:03 -04:00

Now viewport_id always will be in a ViewportId you cannot create a ViewportId you can only get the main one everywere or get the current viewport id with Context::get_viewport_id

This commit is contained in:
Konkitoman
2023-08-09 18:33:59 +03:00
parent 1a7c4700fd
commit 86ef11c521
34 changed files with 775 additions and 663 deletions

View File

@@ -34,7 +34,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::CentralPanel::default().show(ctx, |ui| {

View File

@@ -48,7 +48,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::CentralPanel::default().show(ctx, |ui| {

View File

@@ -67,7 +67,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::CentralPanel::default().show(ctx, |ui| {

View File

@@ -71,7 +71,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::CentralPanel::default().show(ctx, content);

View File

@@ -37,7 +37,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
custom_window_frame(ctx, frame, "egui with custom frame", |ui| {

View File

@@ -28,7 +28,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
let promise = self.promise.get_or_insert_with(|| {

View File

@@ -30,7 +30,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::CentralPanel::default().show(ctx, |ui| {

View File

@@ -37,7 +37,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::CentralPanel::default().show(ctx, |ui| {

View File

@@ -123,7 +123,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::Window::new("Main thread").show(ctx, |ui| {

View File

@@ -26,7 +26,7 @@ impl eframe::App for Content {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::CentralPanel::default().show(ctx, |ui| {

View File

@@ -24,7 +24,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::CentralPanel::default().show(ctx, |ui| {

View File

@@ -42,7 +42,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::CentralPanel::default().show(ctx, |ui| {

View File

@@ -31,7 +31,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::CentralPanel::default().show(ctx, |ui| {

View File

@@ -53,7 +53,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::CentralPanel::default().show(ctx, |ui| {

View File

@@ -44,7 +44,7 @@ impl eframe::App for MyApp {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
egui::CentralPanel::default().show(ctx, |ui| {

View File

@@ -61,7 +61,7 @@ impl eframe::App for Application {
render: Option<&ViewportRender>,
) {
if let Some(render) = render {
render(ctx, ctx.get_viewport_id(), ctx.get_parent_viewport_id());
render(ctx);
return;
}
if let Some(request_at) = self.request_at {

View File

@@ -39,7 +39,9 @@ fn main() {
if show_sync {
ctx.create_viewport_sync(
ViewportBuilder::default().with_title("Sync rendering!"),
|ctx, viewport_id, parent_viewport_id| {
|ctx| {
let viewport_id = ctx.get_viewport_id();
let parent_viewport_id = ctx.get_parent_viewport_id();
egui::CentralPanel::default().show(ctx, |ui| {
ui.label(format!("Frame: {}", ui.ctx().frame_nr()));
ui.horizontal(|ui| {