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

alt+wheel scrolling over the render slots works again (this didnt support scrolling when new interfaces would replace the old ones).

Browse Source
This commit is contained in:
Campbell Barton
2012-08-21 15:45:17 +00:00
parent 3090ae35af
commit 0fd2448c8b
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/editors/interface/interface_handlers.c
View File

@@ -2945,9 +2945,11 @@ static int ui_do_but_BLOCK(bContext *C, uiBut *but, uiHandleButtonData *data, wm
return WM_UI_HANDLER_BREAK;
}
else if (ELEM3(but->type, MENU, ICONROW, ICONTEXTROW)) {
if (event->type == WHEELDOWNMOUSE && event->alt) {
data->value = ui_step_name_menu(but, -1);
if (ELEM(event->type, WHEELDOWNMOUSE, WHEELUPMOUSE) && event->alt) {
const int direction = (event->type == WHEELDOWNMOUSE) ? -1 : 1;
data->value = ui_step_name_menu(but, direction);
button_activate_state(C, but, BUTTON_STATE_EXIT);
ui_apply_button(C, but->block, but, data, 1);
@@ -2961,16 +2963,15 @@ static int ui_do_but_BLOCK(bContext *C, uiBut *but, uiHandleButtonData *data, wm
data->postbut = but;
data->posttype = BUTTON_ACTIVATE_OVER;
return WM_UI_HANDLER_BREAK;
}
else if (event->type == WHEELUPMOUSE && event->alt) {
data->value = ui_step_name_menu(but, 1);
button_activate_state(C, but, BUTTON_STATE_EXIT);
ui_apply_button(C, but->block, but, data, 1);
/* why this is needed described above */
data->postbut = but;
data->posttype = BUTTON_ACTIVATE_OVER;
/* without this, a new interface that draws as result of the menu change
* won't register that the mouse is over it, eg:
* Alt+MouseWheel over the render slots, without this,
* the slot menu fails to switch a second time.
*
* Theactive state of the button could be maintained some other way
* and remove this mousemove event.
*/
WM_event_add_mousemove(C);
return WM_UI_HANDLER_BREAK;
}