1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 05:40:03 -04:00

Add Window::embedded

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

View File

@@ -171,6 +171,7 @@ pub enum ViewportCommand {
pub struct Window<'open> {
title: WidgetText,
open: Option<&'open mut bool>,
embedded: Option<&'open mut bool>,
area: Area,
frame: Option<Frame>,
resize: Resize,
@@ -192,6 +193,7 @@ impl<'open> Window<'open> {
window_builder: ViewportBuilder::default().with_title(title.text()),
title,
open: None,
embedded: None,
area,
frame: None,
resize: Resize::default()
@@ -223,6 +225,11 @@ impl<'open> Window<'open> {
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.
pub fn enabled(mut self, enabled: bool) -> Self {
self.area = self.area.enabled(enabled);
@@ -440,6 +447,7 @@ impl<'open> Window<'open> {
let Window {
title,
mut open,
mut embedded,
area,
frame,
resize,
@@ -450,8 +458,18 @@ impl<'open> Window<'open> {
mut window_builder,
} = self;
let embedded =
ctx.data_mut(|data| *data.get_persisted_mut_or(area.id.with("_embedded"), true));
let embedded = if let Some(embedded) = &mut embedded {
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 {
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());
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 {
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));
}
ctx.create_viewport_sync(
return ctx.create_viewport_sync(
window_builder,
move |ctx, viewport_id, parent_viewport_id| {
let mut op = is_open;

View File

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