diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-27 18:30:26 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-27 18:30:26 +0400 |
| commit | 2403a2395391b74c6960bc1735f75c15e4886ecd (patch) | |
| tree | e336966361e2d0ba6c44a4f76802be9b538abd75 /source/blender/editors/interface/interface_regions.c | |
| parent | b466a5c9a9f1147da9f3c0e5970c740b62e142f5 (diff) | |
Fix #35802: searchbox menu not opening when opened from a popup near the bottom
of the window.
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 0f2cedf8b0a..fbe23b1a1ed 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1253,8 +1253,11 @@ ARegion *ui_searchbox_create(bContext *C, ARegion *butregion, uiBut *but) } if (rect_i.ymin < 0) { - int newy1; - UI_view2d_to_region_no_clip(&butregion->v2d, 0, but->rect.ymax + ofsy, NULL, &newy1); + int newy1 = but->rect.ymax + ofsy; + + if (butregion->v2d.cur.xmin != butregion->v2d.cur.xmax) + UI_view2d_to_region_no_clip(&butregion->v2d, 0, newy1, NULL, &newy1); + newy1 += butregion->winrct.ymin; rect_i.ymax = BLI_rcti_size_y(&rect_i) + newy1; |