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

Add Window::embedded

Browse Source
This commit is contained in:
Konkitoman
2023-08-03 19:39:51 +03:00
parent 9e1e0a55a5
commit 7f791f4bf9
3 changed files with 89 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,6 +171,7 @@ pub enum ViewportCommand {
pub struct Window<'open> { pub struct Window<'open> {
title: WidgetText, title: WidgetText,
open: Option<&'open mut bool>, open: Option<&'open mut bool>,
embedded: Option<&'open mut bool>,
area: Area, area: Area,
frame: Option<Frame>, frame: Option<Frame>,
resize: Resize, resize: Resize,
@@ -192,6 +193,7 @@ impl<'open> Window<'open> {
window_builder: ViewportBuilder::default().with_title(title.text()), window_builder: ViewportBuilder::default().with_title(title.text()),
title, title,
open: None, open: None,
embedded: None,
area, area,
frame: None, frame: None,
resize: Resize::default() resize: Resize::default()
@@ -223,6 +225,11 @@ impl<'open> Window<'open> {
self self
} }
pub fn embedded(mut self, embedded: &'open mut bool) -> Self {
self.embedded = Some(embedded);
self
}
/// If `false` the window will be grayed out and non-interactive. /// If `false` the window will be grayed out and non-interactive.
pub fn enabled(mut self, enabled: bool) -> Self { pub fn enabled(mut self, enabled: bool) -> Self {
self.area = self.area.enabled(enabled); self.area = self.area.enabled(enabled);
@@ -440,6 +447,7 @@ impl<'open> Window<'open> {
let Window { let Window {
title, title,
mut open, mut open,
mut embedded,
area, area,
frame, frame,
resize, resize,
@@ -450,8 +458,18 @@ impl<'open> Window<'open> {
mut window_builder, mut window_builder,
} = self; } = self;
let embedded = let embedded = if let Some(embedded) = &mut embedded {
ctx.data_mut(|data| *data.get_persisted_mut_or(area.id.with("_embedded"), true)); if let Some(tmp_embedded) = ctx.data_mut(|data| {
let tmp = data.get_persisted::<bool>(area.id.with("_embedded"));
data.remove::<bool>(area.id.with("_embedded"));
tmp
}) {
**embedded = tmp_embedded;
}
**embedded
} else {
true
};
let is_open = if let Some(open) = &mut open { let is_open = if let Some(open) = &mut open {
if let Some(tmp_open) = ctx.data_mut(|data| { if let Some(tmp_open) = ctx.data_mut(|data| {
@@ -468,6 +486,11 @@ impl<'open> Window<'open> {
let is_open = is_open || ctx.memory(|mem| mem.everything_is_visible()); let is_open = is_open || ctx.memory(|mem| mem.everything_is_visible());
ctx.data_mut(|data| {
data.insert_persisted(area.id.with("_is_embedded"), embedded);
data.insert_persisted(area.id.with("_is_open"), is_open);
});
if !is_open { if !is_open {
return None; return None;
} }
@@ -501,7 +524,7 @@ impl<'open> Window<'open> {
window_builder.max_inner_size = Some((max_size.x as u32, max_size.y as u32)); window_builder.max_inner_size = Some((max_size.x as u32, max_size.y as u32));
} }
ctx.create_viewport_sync( return ctx.create_viewport_sync(
window_builder, window_builder,
move |ctx, viewport_id, parent_viewport_id| { move |ctx, viewport_id, parent_viewport_id| {
let mut op = is_open; let mut op = is_open;

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

@@ -245,7 +245,6 @@ impl ContextImpl {
// This is used to pause the last frame // This is used to pause the last frame
if !self.frame_stack.is_empty() { if !self.frame_stack.is_empty() {
let viewport_id = self.get_viewport_id(); let viewport_id = self.get_viewport_id();
println!("Pause: {viewport_id}");
self.memory.pause_frame(viewport_id); self.memory.pause_frame(viewport_id);
self.layer_rects_this_viewports.insert( self.layer_rects_this_viewports.insert(
@@ -1490,7 +1489,6 @@ impl Context {
}); });
if !is_last { if !is_last {
let viewport_id = self.get_viewport_id(); let viewport_id = self.get_viewport_id();
println!("Resume: {viewport_id}");
self.write(|ctx| { self.write(|ctx| {
ctx.layer_rects_prev_frame = ctx.layer_rects_prev_frame =
ctx.layer_rects_prev_viewports.remove(&viewport_id).unwrap(); ctx.layer_rects_prev_viewports.remove(&viewport_id).unwrap();

114
examples/viewports/src/main.rs
View File

@@ -8,9 +8,13 @@ fn main() {
let mut to_repair = false; let mut to_repair = false;
let mut show_sync = false;
let mut show = false; let mut show = false;
let mut value = 0.0; let mut value = 0.0;
let mut embedded1 = false;
let mut embedded2 = true;
let _ = eframe::run_simple_native( let _ = eframe::run_simple_native(
"Viewports Examples", "Viewports Examples",
NativeOptions { NativeOptions {
@@ -25,28 +29,31 @@ fn main() {
ctx.set_desktop(is_desktop); ctx.set_desktop(is_desktop);
ui.checkbox(&mut to_repair, "To Repair!"); ui.checkbox(&mut to_repair, "To Repair!");
ctx.create_viewport_sync( ui.checkbox(&mut show_sync, "Show Sync Viewport");
ViewportBuilder::default().with_title("Sync rendering!"), if show_sync {
|ctx, viewport_id, parent_viewport_id| { ctx.create_viewport_sync(
egui::CentralPanel::default().show(ctx, |ui| { ViewportBuilder::default().with_title("Sync rendering!"),
ui.label(format!("Frame: {}", ui.ctx().frame_nr())); |ctx, viewport_id, parent_viewport_id| {
ui.horizontal(|ui| { egui::CentralPanel::default().show(ctx, |ui| {
ui.label("Viewport ID: "); ui.label(format!("Frame: {}", ui.ctx().frame_nr()));
ui.label(format!("{viewport_id}")) ui.horizontal(|ui| {
}); ui.label("Viewport ID: ");
ui.horizontal(|ui| { ui.label(format!("{viewport_id}"))
ui.label("Parent Viewport ID: "); });
ui.label(format!("{parent_viewport_id}")) ui.horizontal(|ui| {
}); ui.label("Parent Viewport ID: ");
ui.checkbox(&mut show, "Show"); ui.label(format!("{parent_viewport_id}"))
ui.add( });
egui::widgets::DragValue::new(&mut value) ui.checkbox(&mut show, "Show");
.clamp_range(-10..=10) ui.add(
.speed(0.1), egui::widgets::DragValue::new(&mut value)
); .clamp_range(-10..=10)
}) .speed(0.1),
}, );
); })
},
);
};
if show { if show {
ui.label("Is shown!"); ui.label("Is shown!");
@@ -54,36 +61,41 @@ fn main() {
} }
egui::CollapsingHeader::new("Show Test1").show(ui, |ui| { egui::CollapsingHeader::new("Show Test1").show(ui, |ui| {
egui::Window::new("Test1").show(ctx, move |ui, id, parent_id| { egui::Window::new("Test1").embedded(&mut embedded1).show(
ui.label(format!("Frame: {}", ui.ctx().frame_nr())); ctx,
let mut embedded = ui.data_mut(|data| { |ui, id, parent_id| {
*data.get_temp_mut_or(Id::new("Test1").with("_embedded"), true) ui.label(format!("Frame: {}", ui.ctx().frame_nr()));
}); let mut embedded = ui.data_mut(|data| {
if ui.checkbox(&mut embedded, "Should embedd?").clicked() { *data.get_temp_mut_or(Id::new("Test1").with("_is_embedded"), true)
ui.ctx().request_repaint_viewport(parent_id); });
} if ui.checkbox(&mut embedded, "Should embedd?").clicked() {
ui.data_mut(|data| { ui.ctx().request_repaint_viewport(parent_id);
data.insert_persisted(Id::new("Test1").with("_embedded"), embedded)
});
if to_repair {
ui.spinner();
}
let ctx = ui.ctx().clone();
ui.label(format!(
"Current rendering window: {}",
ctx.get_viewport_id()
));
if ui.button("Drag").is_pointer_button_down_on() {
if id != parent_id {
ctx.viewport_command(id, egui::window::ViewportCommand::Drag)
} else {
ctx.memory_mut(|mem| {
mem.set_dragged_id(egui::Id::new("Test1").with("frame_resize"))
});
} }
} ui.data_mut(|data| {
}); data.insert_persisted(Id::new("Test1").with("_embedded"), embedded)
});
if to_repair {
ui.spinner();
}
let ctx = ui.ctx().clone();
ui.label(format!(
"Current rendering window: {}",
ctx.get_viewport_id()
));
if ui.button("Drag").is_pointer_button_down_on() {
if id != parent_id {
ctx.viewport_command(id, egui::window::ViewportCommand::Drag)
} else {
ctx.memory_mut(|mem| {
mem.set_dragged_id(
egui::Id::new("Test1").with("frame_resize"),
)
});
}
}
},
);
}); });
egui::CollapsingHeader::new("Shout Test2").show(ui, |ui| { egui::CollapsingHeader::new("Shout Test2").show(ui, |ui| {
egui::Window::new("Test2").show(ctx, move |ui, id, parent_id| { egui::Window::new("Test2").show(ctx, move |ui, id, parent_id| {