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

Some bugfixes

Browse Source
This commit is contained in:
Emil Ernerfeldt
2023-04-25 23:23:18 +02:00
parent 6563522939
commit 9510d3418e
2 changed files with 67 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
crates/egui_extras/src/dock/mod.rs
View File

@@ -161,6 +161,12 @@ pub struct Shares {
}
impl Shares {
fn replace_with(&mut self, a: NodeId, b: NodeId) {
if let Some(share) = self.shares.remove(&a) {
self.shares.insert(b, share);
}
}
fn split(&self, children: &[NodeId], available_width: f32) -> Vec<f32> {
let mut num_shares = 0.0;
for child in children {
@@ -364,6 +370,11 @@ impl<Leaf> Nodes<Leaf> {
self.insert_node(Node::Branch(Branch::new(Layout::Vertical, children)))
}
#[must_use]
pub fn insert_grid_node(&mut self, children: Vec<NodeId>) -> NodeId {
self.insert_node(Node::Branch(Branch::new(Layout::Grid, children)))
}
fn parent(&self, it: NodeId, needle_child: NodeId) -> Option<NodeId> {
match &self.nodes.get(&it)? {
Node::Leaf(_) => None,
@@ -786,6 +797,7 @@ impl<Leaf> Nodes<Leaf> {
);
} else {
// Layout all nodes in case the user switches active tab
// TODO: only layout active tab, or don't register drop-zones during layout.
for &child_id in &branch.children {
self.layout_node(style, behavior, drop_context, active_rect, child_id);
}
@@ -1061,15 +1073,21 @@ impl<Leaf> Nodes<Leaf> {
.1,
);
let mut ui = egui::Ui::new(
ui.ctx().clone(),
ui.layer_id(),
ui.id().with(node_id),
rect,
rect,
);
match &mut node {
Node::Leaf(leaf) => {
let mut leaf_ui = ui.child_ui(rect, *ui.layout());
if behavior.leaf_ui(&mut leaf_ui, node_id, leaf) == UiResponse::DragStarted {
if behavior.leaf_ui(&mut ui, node_id, leaf) == UiResponse::DragStarted {
ui.memory_mut(|mem| mem.set_dragged_id(node_id.id()));
}
}
Node::Branch(branch) => {
self.branch_ui(behavior, drop_context, ui, rect, node_id, branch);
self.branch_ui(behavior, drop_context, &mut ui, rect, node_id, branch);
}
};
@@ -1289,48 +1307,53 @@ impl<Leaf> Nodes<Leaf> {
fn simplify(&mut self, options: &SimplificationOptions, it: NodeId) -> SimplifyAction {
let Some(mut node) = self.nodes.remove(&it) else { return SimplifyAction::Remove; };
if let Node::Branch(Branch {
layout: typ,
children,
..
}) = &mut node
{
if let Node::Branch(branch) = &mut node {
// TODO: join nested versions of the same horizontal/vertical layouts
children.retain_mut(|child| match self.simplify(options, *child) {
SimplifyAction::Remove => false,
SimplifyAction::Keep => true,
SimplifyAction::Replace(new) => {
*child = new;
true
}
});
branch
.children
.retain_mut(|child| match self.simplify(options, *child) {
SimplifyAction::Remove => false,
SimplifyAction::Keep => true,
SimplifyAction::Replace(new) => {
if branch.active_tab == *child {
branch.active_tab = new;
}
branch.linear_shares.replace_with(*child, new);
if let Some(loc) = branch.grid_locations.remove(child) {
branch.grid_locations.insert(new, loc);
}
match typ {
*child = new;
true
}
});
match branch.layout {
Layout::Tabs => {
if options.prune_empty_tabs && children.is_empty() {
if options.prune_empty_tabs && branch.children.is_empty() {
log::debug!("Simplify: removing empty tabs node");
return SimplifyAction::Remove;
}
if options.prune_single_child_tabs && children.len() == 1 {
if options.prune_single_child_tabs && branch.children.len() == 1 {
if options.all_leaves_must_have_tabs
&& matches!(self.get(children[0]), Some(Node::Leaf(_)))
&& matches!(self.get(branch.children[0]), Some(Node::Leaf(_)))
{
// Keep it
} else {
log::debug!("Simplify: collapsing single-child tabs node");
return SimplifyAction::Replace(children[0]);
return SimplifyAction::Replace(branch.children[0]);
}
}
}
Layout::Horizontal | Layout::Vertical | Layout::Grid => {
if options.prune_empty_layouts && children.is_empty() {
if options.prune_empty_layouts && branch.children.is_empty() {
log::debug!("Simplify: removing empty layout node");
return SimplifyAction::Remove;
}
if options.prune_single_child_layouts && children.len() == 1 {
if options.prune_single_child_layouts && branch.children.len() == 1 {
log::debug!("Simplify: collapsing single-child layout node");
return SimplifyAction::Replace(children[0]);
return SimplifyAction::Replace(branch.children[0]);
}
}
}

26
examples/dock/src/main.rs
View File

@@ -153,22 +153,34 @@ impl Default for MyApp {
let mut nodes = dock::Nodes::default();
let tab0 = { nodes.insert_leaf(gen_view()) };
let tab1 = {
let mut tabs = vec![];
tabs.push(nodes.insert_leaf(gen_view()));
tabs.push({
let a = nodes.insert_leaf(gen_view());
let b = nodes.insert_leaf(gen_view());
nodes.insert_tab_node(vec![a, b])
};
let tab2 = {
let c = nodes.insert_leaf(gen_view());
let d = nodes.insert_leaf(gen_view());
let e = nodes.insert_leaf(gen_view());
nodes.insert_tab_node(vec![a, b, c, d, e])
});
tabs.push({
let a = nodes.insert_leaf(gen_view());
let b = nodes.insert_leaf(gen_view());
let c = nodes.insert_leaf(gen_view());
let d = nodes.insert_leaf(gen_view());
let e = nodes.insert_leaf(gen_view());
nodes.insert_horizontal_node(vec![a, b, c, d, e])
};
});
tabs.push({
let a = nodes.insert_leaf(gen_view());
let b = nodes.insert_leaf(gen_view());
let c = nodes.insert_leaf(gen_view());
let d = nodes.insert_leaf(gen_view());
let e = nodes.insert_leaf(gen_view());
nodes.insert_grid_node(vec![a, b, c, d, e])
});
let root = nodes.insert_tab_node(vec![tab0, tab1, tab2]);
let root = nodes.insert_tab_node(tabs);
let dock = dock::Dock::new(root, nodes);