migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 22:00:03 -04:00
Code Activity

Removed Context::set_current_rendering_viewport

Browse Source 
Now we always need to say what viewport we rendering in Context::beagin or Context::run
This commit is contained in:
Konkitoman
2023-07-30 20:03:56 +03:00
parent 1f5d17cfcc
commit fd1c01cf1f
6 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/egui/src/context.rs
View File

@@ -219,7 +219,8 @@ struct ContextImpl {
}
impl ContextImpl {
fn begin_frame_mut(&mut self, mut new_raw_input: RawInput) {
fn begin_frame_mut(&mut self, mut new_raw_input: RawInput, viewport_id: u64) {
self.current_rendering_viewport = viewport_id;
self.repaint.start_frame(self.current_rendering_viewport);
if let Some(new_pixels_per_point) = self.memory.new_pixels_per_point.take() {
@@ -420,8 +421,13 @@ impl Context {
/// // handle full_output
/// ```
#[must_use]
pub fn run(&self, new_input: RawInput, run_ui: impl FnOnce(&Context)) -> FullOutput {
self.begin_frame(new_input);
pub fn run(
&self,
new_input: RawInput,
viewport_id: u64,
run_ui: impl FnOnce(&Context),
) -> FullOutput {
self.begin_frame(new_input, viewport_id);
run_ui(self);
self.end_frame()
}
@@ -443,8 +449,8 @@ impl Context {
/// let full_output = ctx.end_frame();
/// // handle full_output
/// ```
pub fn begin_frame(&self, new_input: RawInput) {
self.write(|ctx| ctx.begin_frame_mut(new_input));
pub fn begin_frame(&self, new_input: RawInput, viewport_id: u64) {
self.write(|ctx| ctx.begin_frame_mut(new_input, viewport_id));
}
}
@@ -1973,9 +1979,6 @@ impl Context {
use containers::window::ViewportBuilder;
/// # Windows
impl Context {
pub fn set_current_viewport_id(&self, viewport_id: u64) {
self.write(|ctx| ctx.current_rendering_viewport = viewport_id);
}
pub fn current_rendering_viewport(&self) -> u64 {
self.read(|ctx| ctx.current_rendering_viewport)
}

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

@@ -555,7 +555,7 @@ pub type ViewportRender = dyn Fn(&Context, u64, u64) + Sync + Send;
pub fn __run_test_ctx(mut run_ui: impl FnMut(&Context)) {
let ctx = Context::default();
ctx.set_fonts(FontDefinitions::empty()); // prevent fonts from being loaded (save CPU time)
let _ = ctx.run(Default::default(), |ctx| {
let _ = ctx.run(Default::default(), 0, |ctx| {
run_ui(ctx);
});
}
@@ -564,7 +564,7 @@ pub fn __run_test_ctx(mut run_ui: impl FnMut(&Context)) {
pub fn __run_test_ui(mut add_contents: impl FnMut(&mut Ui)) {
let ctx = Context::default();
ctx.set_fonts(FontDefinitions::empty()); // prevent fonts from being loaded (save CPU time)
let _ = ctx.run(Default::default(), |ctx| {
let _ = ctx.run(Default::default(), 0, |ctx| {
crate::CentralPanel::default().show(ctx, |ui| {
add_contents(ui);
});