diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-18 09:41:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-18 09:50:18 +0300 |
| commit | b749e43cd3e2a76a58f3fb7b47959b684061ea9b (patch) | |
| tree | a76ade362ffaa3bbb2342ed3c0fa31761363fb32 /source/blender/editors/interface/interface_region_popup.c | |
| parent | 8f5ba8e1a1df2e496bbf24573a68cffe564e24db (diff) | |
Fix color ramp eyedropper menu item
This couldn't be accessed because the poll function was checking the
active button.
Add a "color_ramp" context pointer which is set by the menu.
Alternative fix to D3984
Diffstat (limited to 'source/blender/editors/interface/interface_region_popup.c')
| -rw-r--r-- | source/blender/editors/interface/interface_region_popup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_region_popup.c b/source/blender/editors/interface/interface_region_popup.c index 91020cea371..2275ee9ebf5 100644 --- a/source/blender/editors/interface/interface_region_popup.c +++ b/source/blender/editors/interface/interface_region_popup.c @@ -203,13 +203,13 @@ static void ui_popup_block_position(wmWindow *window, ARegion *butregion, uiBut if (dir1 == UI_DIR_LEFT) { offset_x = butrct.xmin - block->rect.xmax; - if (dir2 == UI_DIR_UP) offset_y = butrct.ymin - block->rect.ymin - center_y - MENU_PADDING; - else offset_y = butrct.ymax - block->rect.ymax + center_y + MENU_PADDING; + if (dir2 == UI_DIR_UP) offset_y = butrct.ymin - block->rect.ymin - center_y - UI_MENU_PADDING; + else offset_y = butrct.ymax - block->rect.ymax + center_y + UI_MENU_PADDING; } else if (dir1 == UI_DIR_RIGHT) { offset_x = butrct.xmax - block->rect.xmin; - if (dir2 == UI_DIR_UP) offset_y = butrct.ymin - block->rect.ymin - center_y - MENU_PADDING; - else offset_y = butrct.ymax - block->rect.ymax + center_y + MENU_PADDING; + if (dir2 == UI_DIR_UP) offset_y = butrct.ymin - block->rect.ymin - center_y - UI_MENU_PADDING; + else offset_y = butrct.ymax - block->rect.ymax + center_y + UI_MENU_PADDING; } else if (dir1 == UI_DIR_UP) { offset_y = butrct.ymax - block->rect.ymin; |