Fix #121386: Property context menu shows bone collection operation #121387

Pratik Borhade · 2024-05-03T13:22:24+02:00

Pratik Borhade commented

2024-05-03 13:22:24 +02:00

Check "clicked" button type to avoid adding tree-view item operations
in context menu.

Main	PR

Check "clicked" button type to avoid adding tree-view item operations in context menu. | Main | PR | | -- | -- | | ![image](https://projects.blender.org/attachments/01b3707d-3d7c-41e6-a186-202d5e374aa9) | ![image](/attachments/8aeb88e0-21e7-4ef1-b5d2-6dea07d54229) |

image.png

35 KiB

Pratik Borhade added 1 commit 2024-05-03 13:22:33 +02:00

4b82719ea5 Fix #121386 : Property context menu shows bone collection operation

Check "clicked" button type to avoid adding tree-view item operations
in context menu.

Pratik Borhade requested review from Pablo Vazquez 2024-05-03 13:24:22 +02:00

Pratik Borhade requested review from Julian Eisel 2024-05-03 13:24:22 +02:00

Pablo Vazquez approved these changes 2024-05-03 14:58:07 +02:00

Pablo Vazquez left a comment

Makes sense from the user point of view. Thanks!

Julian Eisel requested changes 2024-05-03 16:42:37 +02:00

Julian Eisel left a comment

This is a bit problematic. At least with the way this is done here, the context menu for the asset shelf breaks. That's because it overlays the preview-tile button on top of the view-item. This is typical for view-item buttons which are usually overlapped by other buttons. I'd expect other cases to break too.

One thing we could try would be adding the view-item context menu when the overlapped button is non-interactive. But I don't think this would work either, since the preview tile may well have own interaction handling.

So I don't really see a way to do this well, except maybe explicitly tagging buttons that should include (or exclude) the view-item context menu.

Another option is moving the view-item context menu into a sub-menu, when the top-most button isn't the view-item button.

This is a bit problematic. At least with the way this is done here, the context menu for the asset shelf breaks. That's because it overlays the preview-tile button on top of the view-item. This is typical for view-item buttons which are usually overlapped by other buttons. I'd expect other cases to break too. One thing we could try would be adding the view-item context menu when the overlapped button is non-interactive. But I don't think this would work either, since the preview tile may well have own interaction handling. So I don't really see a way to do this well, except maybe explicitly tagging buttons that should include (or exclude) the view-item context menu. Another option is moving the view-item context menu into a sub-menu, when the top-most button isn't the view-item button.

Pratik Borhade commented

2024-05-04 13:01:43 +02:00

Another option is moving the view-item context menu into a sub-menu, when the top-most button isn't the view-item button.

I think this will also move the asset shelf context menu operations in sub-menu.

> Another option is moving the view-item context menu into a sub-menu, when the top-most button isn't the view-item button. I think this will also move the asset shelf context menu operations in sub-menu.

Pratik Borhade commented

2024-05-04 13:09:10 +02:00

Cheap fix would be:

diff --git a/source/blender/editors/interface/interface_context_menu.cc b/source/blender/editors/interface/interface_context_menu.cc
index e89443f67a9..1a4c2e04efb 100644
--- a/source/blender/editors/interface/interface_context_menu.cc
+++ b/source/blender/editors/interface/interface_context_menu.cc
@@ -1072,7 +1072,7 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but, const wmEvent *ev
     const ARegion *region = CTX_wm_menu(C) ? CTX_wm_menu(C) : CTX_wm_region(C);
     uiButViewItem *view_item_but = (uiButViewItem *)ui_view_item_find_mouse_over(region,
                                                                                  event->xy);
-    if (view_item_but) {
+    if (view_item_but && ELEM(but->type, UI_BTYPE_VIEW_ITEM, UI_BTYPE_PREVIEW_TILE)) {
       BLI_assert(view_item_but->type == UI_BTYPE_VIEW_ITEM);

       const bContextStore *prev_ctx = CTX_store_get(C);

Cheap fix would be: ```Diff diff --git a/source/blender/editors/interface/interface_context_menu.cc b/source/blender/editors/interface/interface_context_menu.cc index e89443f67a9..1a4c2e04efb 100644 --- a/source/blender/editors/interface/interface_context_menu.cc +++ b/source/blender/editors/interface/interface_context_menu.cc @@ -1072,7 +1072,7 @@ bool ui_popup_context_menu_for_button(bContext *C, uiBut *but, const wmEvent *ev const ARegion *region = CTX_wm_menu(C) ? CTX_wm_menu(C) : CTX_wm_region(C); uiButViewItem *view_item_but = (uiButViewItem *)ui_view_item_find_mouse_over(region, event->xy); - if (view_item_but) { + if (view_item_but && ELEM(but->type, UI_BTYPE_VIEW_ITEM, UI_BTYPE_PREVIEW_TILE)) { BLI_assert(view_item_but->type == UI_BTYPE_VIEW_ITEM); const bContextStore *prev_ctx = CTX_store_get(C); ```

Merge conflict checking is in progress. Try again in few moments.

View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u 121386-ctx-extra-op:PratikPB2123-121386-ctx-extra-op

git checkout PratikPB2123-121386-ctx-extra-op

Sign in to join this conversation.

No reviewers

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Fix #121386: Property context menu shows bone collection operation #121387

Checkout