1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 05:10:03 -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

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

View File

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

View File

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

View File

@@ -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);

View File

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

View File

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

View File

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

View File

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

View File

@@ -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();

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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