migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 14:50:03 -04:00
Code Activity

Remove viewport_id and parent_viewport_id from Window::show arguments because can be accessed from Context::get_viewport_id and Context::get_parent_viewport_id

Browse Source
This commit is contained in:
Konkitoman
2023-08-03 19:53:17 +03:00
parent 7f791f4bf9
commit 1448c5047f
30 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
crates/egui/src/containers/window.rs
View File

@@ -434,7 +434,7 @@ impl<'open> Window<'open> {
pub fn show<R>(
self,
ctx: &Context,
add_contents: impl FnOnce(&mut Ui, u64, u64) -> R,
add_contents: impl FnOnce(&mut Ui) -> R,
) -> Option<InnerResponse<Option<R>>> {
self.show_dyn(ctx, Box::new(add_contents))
}
@@ -442,7 +442,7 @@ impl<'open> Window<'open> {
fn show_dyn<'a, R>(
self,
ctx: &Context,
add_contents: Box<dyn FnOnce(&mut Ui, u64, u64) -> R + 'a>,
add_contents: Box<dyn FnOnce(&mut Ui) -> R + 'a>,
) -> Option<InnerResponse<Option<R>>> {
let Window {
title,
@@ -662,17 +662,9 @@ impl<'open> Window<'open> {
}
if scroll.has_any_bar() {
scroll
.show(ui, |ui| {
add_contents(
ui,
viewport_id,
parent_viewport_id,
)
})
.inner
scroll.show(ui, |ui| add_contents(ui)).inner
} else {
add_contents(ui, viewport_id, parent_viewport_id)
add_contents(ui)
}
})
})
@@ -854,9 +846,9 @@ impl<'open> Window<'open> {
}
if scroll.has_any_bar() {
scroll.show(ui, |ui| add_contents(ui, 0, 0)).inner
scroll.show(ui, |ui| add_contents(ui)).inner
} else {
add_contents(ui, 0, 0)
add_contents(ui)
}
})
})