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

Merge branch 'blender-v2.82-release'

Browse Source
This commit is contained in:
Brecht Van Lommel
2020-01-28 14:45:19 +01:00
parent 5536be2cfe cdd223039b
commit 01a3482742
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9551,18 +9551,29 @@ static int ui_handle_menu_event(bContext *C,
break;
case WHEELUPMOUSE:
case WHEELDOWNMOUSE: {
case WHEELDOWNMOUSE:
case MOUSEPAN: {
if (IS_EVENT_MOD(event, shift, ctrl, alt, oskey)) {
/* pass */
}
else if (!ui_block_is_menu(block)) {
const int scroll_dir = (event->type == WHEELUPMOUSE) ? 1 : -1;
if (ui_menu_scroll_step(ar, block, scroll_dir)) {
if (but) {
but->active->cancel = true;
button_activate_exit(C, but, but->active, false, false);
int type = event->type;
int val = event->val;
/* convert pan to scrollwheel */
if (type == MOUSEPAN) {
ui_pan_to_scroll(event, &type, &val);
}
if (type != MOUSEPAN) {
const int scroll_dir = (type == WHEELUPMOUSE) ? 1 : -1;
if (ui_menu_scroll_step(ar, block, scroll_dir)) {
if (but) {
but->active->cancel = true;
button_activate_exit(C, but, but->active, false, false);
}
WM_event_add_mousemove(C);
}
WM_event_add_mousemove(C);
}
break;
}
@@ -9574,7 +9585,6 @@ static int ui_handle_menu_event(bContext *C,
case PAGEDOWNKEY:
case HOMEKEY:
case ENDKEY:
case MOUSEPAN:
/* arrowkeys: only handle for block_loop blocks */
if (IS_EVENT_MOD(event, shift, ctrl, alt, oskey)) {
/* pass */

2
source/blender/editors/interface/interface_icons.c
View File

@@ -1509,7 +1509,7 @@ static void icon_draw_rect(float x,
return;
}
/* modulate color */
float col[4] = {1.0f, 1.0f, 1.0f, alpha};
float col[4] = {alpha, alpha, alpha, alpha};
/* rect contains image in 'rendersize', we only scale if needed */
if (rw != w || rh != h) {