griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #124448, #115549: View Drag drop not working

Browse Source 
Issue was that the left mouse press event was handled to activate the
dragging state, but not "consumed". So general view item handling would
attempt to force-activate it again, exiting the dragging state
immediately again.

Consume the event now, plus handle properly any similar unexpected cases
(with failing assert), where modal state would be exited because of an
unconsumed event.

Alternative solution to #124529, thanks to Pratik Borhade for finding
the root of the issue.
This commit is contained in:
Julian Eisel
2024-07-11 15:32:52 +02:00
parent acd4a85d6b
commit d6e9438e60
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/interface/interface_handlers.cc
View File

@@ -528,6 +528,7 @@ static void button_activate_init(bContext *C,
uiBut *but,
uiButtonActivateType type);
static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState state);
static bool button_modal_state(uiHandleButtonState state);
static void button_activate_exit(
bContext *C, uiBut *but, uiHandleButtonData *data, const bool mousemove, const bool onfree);
static int ui_handler_region_menu(bContext *C, const wmEvent *event, void *userdata);
@@ -4916,6 +4917,14 @@ static int ui_do_but_TOG(bContext *C, uiBut *but, uiHandleButtonData *data, cons
static void force_activate_view_item_but(bContext *C, ARegion *region, uiButViewItem *but)
{
if (but->active && button_modal_state(but->active->state)) {
/* Shouldn't change the button state here while it's modal. Probably the event should be
* consumed in that state (return #WM_UI_HANDLER_BREAK), but maybe there are valid reasons not
* to (remove the assert in that case). */
BLI_assert_unreachable();
return;
}
if (but->active) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
@@ -4955,7 +4964,7 @@ static int ui_do_but_VIEW_ITEM(bContext *C,
force_activate_view_item_but(C, data->region, view_item_but);
}
return WM_UI_HANDLER_CONTINUE;
return WM_UI_HANDLER_BREAK;
case KM_DBL_CLICK:
data->cancel = true;
UI_view_item_begin_rename(*view_item_but->view_item);