tree: context menu and selection painting again

Author: kurasu

gui/src/tree.rs

@@ -58,15 +58,21 @@ impl NodeTree {
                         DragDropPayload::WithNode(node_id),
                         on_action,
                         |ui| {
-                            ui.label("○");
-                            ui.label(node_name)
+                            Self::node_frame(ui, app.ui.selected_node == node_id).show(ui, |ui| {
+                                ui.label("○");
+                                ui.label(node_name);
+                            });
                         },
                     );
 
                     let response = ui.interact(ui.min_rect(), id2, egui::Sense::click());
                     if response.clicked() {
                         on_action(GuiAction::SelectNode { node: node_id });
                     }
+
+                    response.context_menu(|ui| {
+                        Self::context_menu(app, node, on_action, node_id, ui);
+                    });
                 });
             });
 
@@ -181,23 +187,6 @@ impl NodeTree {
                 }
             }
 
-            response.context_menu(|ui| {
-                if ui.button("Add child node").clicked() {
-                    on_action(GuiAction::AddNode {
-                        parent: node_id,
-                        index: node.children.len(),
-                    });
-                    ui.close_menu()
-                }
-                if ui.button("Delete").clicked() {
-                    on_action(GuiAction::RemoveNode { node: node_id });
-                    ui.close_menu()
-                }
-                for tag in node.tags.iter() {
-                    ui.label(app.document.tag_name(*tag));
-                }
-            });
-
             // Check for drags:
             let dnd_response = ui
                 .interact(response.rect.clone(), id, Sense::drag())
@@ -207,6 +196,23 @@ impl NodeTree {
         }
     }
 
+    fn context_menu(app: &Application, node: &Node, on_action: &mut impl FnMut(GuiAction), node_id: NodeId, ui: &mut Ui) {
+        if ui.button("Add child node").clicked() {
+            on_action(GuiAction::AddNode {
+                parent: node_id,
+                index: node.children.len(),
+            });
+            ui.close_menu()
+        }
+        if ui.button("Delete").clicked() {
+            on_action(GuiAction::RemoveNode { node: node_id });
+            ui.close_menu()
+        }
+        for tag in node.tags.iter() {
+            ui.label(app.document.tag_name(*tag));
+        }
+    }
+
     fn is_ancestor(&self, app: &Application, node_id: NodeId, assumed_ancestor: NodeId) -> bool {
         let node = app.document.nodes.get(node_id).expect("");