Apply context menu to Response

mankinskin · mankinskin · commit 701baf90f78c · 2021-07-07T15:59:50.000+02:00
diff --git a/egui/src/context.rs b/egui/src/context.rs
@@ -300,8 +300,8 @@ impl CtxRef {
     }
 
 
-    pub(crate) fn show_ui_context_menu(&self, ui: &mut Ui, add_contents: impl FnOnce(&mut Ui, &mut MenuState))  {
-        self.context_menu_system().ui_context_menu(ui, add_contents)
+    pub(crate) fn show_ui_context_menu(&self, response: &Response, add_contents: impl FnOnce(&mut Ui, &mut MenuState))  {
+        self.context_menu_system().ui_context_menu(response, add_contents)
     }
 }
 
diff --git a/egui/src/context_menu.rs b/egui/src/context_menu.rs
@@ -12,29 +12,23 @@ pub struct ContextMenuSystem {
     context_menu: Option<ContextMenuRoot>,
 }
 impl ContextMenuSystem {
-    fn response(&mut self, ui: &mut Ui, add_contents: impl FnOnce(&mut Ui, &mut MenuState)) -> MenuResponse {
-        if let Some(context_menu) = &mut self.context_menu {
-            if context_menu.ui_id == ui.id() {
-                let response = context_menu.show(ui.ctx(), add_contents);
-                context_menu.rect = response.rect;
-
-                if context_menu.response.is_close() {
-                    return MenuResponse::Close;
-                }
-            }
-        }
-        let pointer = &ui.input().pointer;
-        if let Some(pos) = pointer.interact_pos() {
-            if pointer.any_pressed() {
+    fn sense_click(&mut self, response: &Response) -> MenuResponse {
+        let Response {
+            id,
+            ctx,
+            ..
+        } = response;
+        let pointer = &ctx.input().pointer;
+        if pointer.any_pressed() {
+            if let Some(pos) = pointer.interact_pos() {
                 let mut destroy = false;
                 let mut in_old_menu = false;
                 if let Some(context_menu) = &mut self.context_menu {
                     in_old_menu = context_menu.area_contains(pos);
-                    destroy = context_menu.ui_id == ui.id();
+                    destroy = context_menu.ui_id == *id;
                 }
-                let in_ui = ui.rect_contains_pointer(ui.max_rect_finite());
                 if !in_old_menu {
-                    if in_ui {
+                    if response.hovered() {
                         if pointer.button_down(PointerButton::Secondary) {
                             // todo: adapt to context
                             return MenuResponse::Create(pos);
@@ -49,15 +43,31 @@ impl ContextMenuSystem {
         }
         MenuResponse::Stay
     }
-    pub fn ui_context_menu(&mut self, ui: &mut Ui, add_contents: impl FnOnce(&mut Ui, &mut MenuState)) {
-        match self.response(ui, add_contents) {
+    fn show(&mut self, response: &Response, add_contents: impl FnOnce(&mut Ui, &mut MenuState)) -> MenuResponse {
+        if let Some(context_menu) = &mut self.context_menu {
+            if context_menu.ui_id == response.id {
+                let response = context_menu.show(&response.ctx, add_contents);
+                context_menu.rect = response.rect;
+
+                if context_menu.response.is_close() {
+                    return MenuResponse::Close;
+                }
+            }
+        }
+        MenuResponse::Stay
+    }
+    pub fn ui_context_menu(&mut self, response: &Response, add_contents: impl FnOnce(&mut Ui, &mut MenuState)) {
+        match self.sense_click(response) {
             MenuResponse::Create(pos) => {
-                self.context_menu = Some(ContextMenuRoot::new(pos, ui.id()));
+                self.context_menu = Some(ContextMenuRoot::new(pos, response.id));
             },
             MenuResponse::Close => {
                 self.context_menu = None
             },
             MenuResponse::Stay => {}
+        };
+        if let MenuResponse::Close = self.show(response, add_contents) {
+            self.context_menu = None
         }
     }
 }
diff --git a/egui/src/response.rs b/egui/src/response.rs
@@ -451,6 +451,11 @@ impl Response {
             self.ctx.output().events.push(event);
         }
     }
+
+    pub fn context_menu(&self, add_contents: impl FnOnce(&mut Ui, &mut super::context_menu::MenuState)) -> &Self {
+        self.ctx.show_ui_context_menu(&self, add_contents);
+        self
+    }
 }
 
 impl Response {
diff --git a/egui/src/ui.rs b/egui/src/ui.rs
@@ -327,9 +327,6 @@ impl Ui {
         self.painter.set_clip_rect(clip_rect);
     }
 
-    pub fn context_menu(&mut self, add_contents: impl FnOnce(&mut Ui, &mut MenuState)) {
-        self.ctx().clone().show_ui_context_menu(self, add_contents)
-    }
 }
 
 // ------------------------------------------------------------------------
diff --git a/egui_demo_lib/src/apps/demo/drag_and_drop.rs b/egui_demo_lib/src/apps/demo/drag_and_drop.rs
@@ -119,12 +119,6 @@ impl super::View for DragAndDropDemo {
         let mut source_col_row = None;
         let mut drop_col = None;
         ui.columns(self.columns.len(), |uis| {
-            uis[0].context_menu(|ui, menu_state| {
-                if ui.button("New Item...").clicked() {
-                    self.columns[0].push("New Item".to_string());
-                    menu_state.close();
-                }
-            });
             for (col_idx, column) in self.columns.clone().into_iter().enumerate() {
                 let ui = &mut uis[col_idx];
                 let can_accept_what_is_being_dragged = true; // We accept anything being dragged (for now) ¯\_(ツ)_/¯
@@ -133,7 +127,13 @@ impl super::View for DragAndDropDemo {
                     for (row_idx, item) in column.iter().enumerate() {
                         let item_id = Id::new("item").with(col_idx).with(row_idx);
                         drag_source(ui, item_id, |ui| {
-                            ui.label(item);
+                            ui.add(Label::new(item).sense(Sense::click()))
+                                .context_menu(|ui, menu_state| {
+                                    if ui.button("Remove...").clicked() {
+                                        self.columns[col_idx].remove(row_idx);
+                                        menu_state.close();
+                                    }
+                                });
                         });
 
                         if ui.memory().is_being_dragged(item_id) {
@@ -143,6 +143,15 @@ impl super::View for DragAndDropDemo {
                 })
                 .response;
 
+                if col_idx == 0 {
+                    response.context_menu(|ui, menu_state| {
+                        if ui.button("New Item...").clicked() {
+                            self.columns[0].push("New Item".to_string());
+                            menu_state.close();
+                        }
+                    });
+                }
+
                 let is_being_dragged = ui.memory().is_anything_being_dragged();
                 if is_being_dragged && can_accept_what_is_being_dragged && response.hovered() {
                     drop_col = Some(col_idx);
diff --git a/egui_demo_lib/src/apps/demo/widget_gallery.rs b/egui_demo_lib/src/apps/demo/widget_gallery.rs
@@ -223,8 +223,8 @@ impl WidgetGallery {
         ui.end_row();
 
         ui.add(doc_link_label("Plot", "plot"));
-        ui.scope(|ui| {
-            ui.context_menu(|ui, menu_state| {
+        ui.add(example_plot(plot))
+            .context_menu(|ui, menu_state| {
                 if ui.button("Sin").clicked() {
                     *plot = Plot::Sin;
                     menu_state.close();
@@ -236,8 +236,6 @@ impl WidgetGallery {
                     menu_state.close();
                 }
             });
-            ui.add(example_plot(plot));
-        });
 
         ui.end_row();
 
diff --git a/egui_demo_lib/src/apps/demo/window_options.rs b/egui_demo_lib/src/apps/demo/window_options.rs
@@ -90,12 +90,13 @@ impl super::View for WindowOptions {
         ui.horizontal(|ui| {
             ui.label("title:");
             ui.text_edit_singleline(title);
-            ui.context_menu(|ui, menu_state| {
-                if ui.button("Clear..").clicked() {
-                    *title = String::new();
-                    menu_state.close();
-                }
-            });
+        })
+        .response
+        .context_menu(|ui, menu_state| {
+            if ui.button("Clear..").clicked() {
+                *title = String::new();
+                menu_state.close();
+            }
         });
         ui.checkbox(title_bar, "title_bar");
         ui.checkbox(closable, "closable");
diff --git a/egui_demo_lib/src/backend_panel.rs b/egui_demo_lib/src/backend_panel.rs
@@ -103,40 +103,37 @@ impl BackendPanel {
         self.egui_windows.windows(ctx);
     }
 
-    fn context_menu(&mut self, ui: &mut egui::Ui) {
+    pub fn context_menu(ui: &mut egui::Ui, menu_state: &mut egui::context_menu::MenuState) {
         use egui::context_menu::SubMenu;
-        ui.context_menu(|ui, menu_state| {
-            if ui.button("Open...").clicked() {
-                menu_state.close();
-            }
-            SubMenu::new("SubMenu")
-                .show(ui, menu_state, |ui, menu_state| {
-                    if ui.button("Open...").clicked() {
-                        menu_state.close();
-                    }
-                    SubMenu::new("SubMenu")
-                        .show(ui, menu_state, |ui, menu_state| {
-                            if ui.button("Open...").clicked() {
-                                menu_state.close();
-                            }
-                            let _ = ui.button("Item");
-                        });
-                    let _ = ui.button("Item");
-                });
-            SubMenu::new("SubMenu")
-                .show(ui, menu_state, |ui, _menu_state| {
-                    let _ = ui.button("Item1");
-                    let _ = ui.button("Item2");
-                    let _ = ui.button("Item3");
-                    let _ = ui.button("Item4");
-                });
-            let _ = ui.button("Item");
-        });
+        if ui.button("Open...").clicked() {
+            menu_state.close();
+        }
+        SubMenu::new("SubMenu")
+            .show(ui, menu_state, |ui, menu_state| {
+                if ui.button("Open...").clicked() {
+                    menu_state.close();
+                }
+                SubMenu::new("SubMenu")
+                    .show(ui, menu_state, |ui, menu_state| {
+                        if ui.button("Open...").clicked() {
+                            menu_state.close();
+                        }
+                        let _ = ui.button("Item");
+                    });
+                let _ = ui.button("Item");
+            });
+        SubMenu::new("SubMenu")
+            .show(ui, menu_state, |ui, _menu_state| {
+                let _ = ui.button("Item1");
+                let _ = ui.button("Item2");
+                let _ = ui.button("Item3");
+                let _ = ui.button("Item4");
+            });
+        let _ = ui.button("Item");
     }
 
     pub fn ui(&mut self, ui: &mut egui::Ui, frame: &mut epi::Frame<'_>) {
         egui::trace!(ui);
-        self.context_menu(ui);
         ui.vertical_centered(|ui| {
             ui.heading("💻 Backend");
         });
diff --git a/egui_demo_lib/src/wrap_app.rs b/egui_demo_lib/src/wrap_app.rs
@@ -1,3 +1,4 @@
+use super::backend_panel::BackendPanel;
 /// All the different demo apps.
 #[derive(Default)]
 #[cfg_attr(feature = "persistence", derive(serde::Deserialize, serde::Serialize))]
@@ -32,7 +33,7 @@ impl Apps {
 pub struct WrapApp {
     selected_anchor: String,
     apps: Apps,
-    backend_panel: super::backend_panel::BackendPanel,
+    backend_panel: BackendPanel,
 }
 
 impl epi::App for WrapApp {
@@ -92,7 +93,9 @@ impl epi::App for WrapApp {
         if self.backend_panel.open || ctx.memory().everything_is_visible() {
             egui::SidePanel::left("backend_panel").show(ctx, |ui| {
                 self.backend_panel.ui(ui, frame);
-            });
+            })
+            .response
+            .context_menu(|ui, menu_state| BackendPanel::context_menu(ui, menu_state));
         }
 
         for (anchor, app) in self.apps.iter_mut() {
@@ -110,11 +113,6 @@ impl WrapApp {
         // A menu-bar is a horizontal layout with some special styles applied.
         // egui::menu::bar(ui, |ui| {
         ui.horizontal_wrapped(|ui| {
-            ui.context_menu(|ui, _menu_state| {
-                if ui.button("Print something").clicked() {
-                    println!("something");
-                }
-            });
             dark_light_mode_switch(ui);
 
             ui.checkbox(&mut self.backend_panel.open, "💻 Backend");
@@ -147,6 +145,12 @@ impl WrapApp {
 
                 egui::warn_if_debug_build(ui);
             });
+        })
+        .response
+        .context_menu(|ui, _menu_state| {
+            if ui.button("Print something").clicked() {
+                println!("something");
+            }
         });
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -300,8 +300,8 @@ impl CtxRef {`
`300`	`300`	`}`
`301`	`301`
`302`	`302`
`303`		`- pub(crate) fn show_ui_context_menu(&self, ui: &mut Ui, add_contents: impl FnOnce(&mut Ui, &mut MenuState)) {`
`304`		`- self.context_menu_system().ui_context_menu(ui, add_contents)`
	`303`	`+ pub(crate) fn show_ui_context_menu(&self, response: &Response, add_contents: impl FnOnce(&mut Ui, &mut MenuState)) {`
	`304`	`+ self.context_menu_system().ui_context_menu(response, add_contents)`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`
Original file line number	Diff line number	Diff line change
`@@ -451,6 +451,11 @@ impl Response {`
`451`	`451`	`self.ctx.output().events.push(event);`
`452`	`452`	`}`
`453`	`453`	`}`
	`454`	`+`
	`455`	`+ pub fn context_menu(&self, add_contents: impl FnOnce(&mut Ui, &mut super::context_menu::MenuState)) -> &Self {`
	`456`	`+ self.ctx.show_ui_context_menu(&self, add_contents);`
	`457`	`+ self`
	`458`	`+ }`
`454`	`459`	`}`
`455`	`460`
`456`	`461`	`impl Response {`
Original file line number	Diff line number	Diff line change
`@@ -327,9 +327,6 @@ impl Ui {`
`327`	`327`	`self.painter.set_clip_rect(clip_rect);`
`328`	`328`	`}`
`329`	`329`
`330`		`- pub fn context_menu(&mut self, add_contents: impl FnOnce(&mut Ui, &mut MenuState)) {`
`331`		`- self.ctx().clone().show_ui_context_menu(self, add_contents)`
`332`		`- }`
`333`	`330`	`}`
`334`	`331`
`335`	`332`	`// ------------------------------------------------------------------------`