migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-06-27 23:13:13 -04:00
Code Activity

Removed viewport_id and parent_viewport_id from eframe::Frame

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/eframe/src/epi/mod.rs
View File

@@ -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<f32>,
/// 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,

4
crates/eframe/src/lib.rs
View File

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

4
crates/eframe/src/native/epi_integration.rs
View File

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

4
crates/egui_demo_app/src/apps/custom3d_glow.rs
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| {

16
crates/egui_demo_app/src/wrap_app.rs
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")]

2
examples/confirm_exit/src/main.rs
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| {

4
examples/custom_3d_glow/src/main.rs
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| {

4
examples/custom_font/src/main.rs
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| {

4
examples/custom_font_style/src/main.rs
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);

2
examples/custom_window_frame/src/main.rs
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| {

4
examples/download_image/src/main.rs
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(|| {

4
examples/file_dialog/src/main.rs
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| {

4
examples/hello_world/src/main.rs
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| {

4
examples/hello_world_par/src/main.rs
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();

4
examples/keyboard_events/src/main.rs
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| {

4
examples/puffin_profiler/src/main.rs
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| {

4
examples/retained_image/src/main.rs
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| {

2
examples/screenshot/src/main.rs
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| {

2
examples/serial_windows/src/main.rs
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| {

4
examples/svg/src/main.rs
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| {

2
examples/user_attention/src/main.rs
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 {