[Bf-blender-cvs] [2bd0263fbf2] master: Fix T83346: Scrolling doesn't work with mouse over panel header

Hans Goudey noreply at git.blender.org
Fri Dec 4 06:37:22 CET 2020


Commit: 2bd0263fbf2175c672d46c9df9eff7fd3ceecbce
Author: Hans Goudey
Date:   Thu Dec 3 23:37:16 2020 -0600
Branches: master
https://developer.blender.org/rB2bd0263fbf2175c672d46c9df9eff7fd3ceecbce

Fix T83346: Scrolling doesn't work with mouse over panel header

Just a misplaced assignment to the return value from the panel handler
in rB600fb28b6295.

===================================================================

M	source/blender/editors/interface/interface_panel.c

===================================================================

diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index b60fa40f39a..e96c0a25d6d 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -2452,11 +2452,12 @@ int ui_handler_panel_region(bContext *C,
 
     if (mouse_state == PANEL_MOUSE_INSIDE_HEADER) {
       /* All mouse clicks inside panel headers should return in break. */
-      retval = WM_UI_HANDLER_BREAK;
       if (ELEM(event->type, EVT_RETKEY, EVT_PADENTER, LEFTMOUSE)) {
+        retval = WM_UI_HANDLER_BREAK;
         ui_handle_panel_header(C, block, mx, event->type, event->ctrl, event->shift);
       }
       else if (event->type == RIGHTMOUSE) {
+        retval = WM_UI_HANDLER_BREAK;
         ui_popup_context_menu_for_panel(C, region, block->panel);
       }
       break;



More information about the Bf-blender-cvs mailing list