Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYevgeny Makarov <jenkm>2019-10-01 21:02:15 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-10-01 21:10:46 +0300
commitcd9da385b0111f0814d36125a25399e059b36e54 (patch)
treef943c8844348af9e131a54ce81b6a7bddb7dbc6d /source/blender/editors/interface
parentf0f189de76a3ac44208053a441a81c86718e6ef2 (diff)
UI: fix misaligned popover arrow near the region edge
Differential Revision: https://developer.blender.org/D5872
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r--source/blender/editors/interface/interface_widgets.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 6d2d5ddd5b9..9f1b11d1354 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -4914,7 +4914,9 @@ static void ui_draw_popover_back_impl(const uiWidgetColors *wcol,
{
/* tsk, this isn't nice. */
const float unit_half = unit_size / 2;
- const float cent_x = mval_origin ? mval_origin[0] : BLI_rcti_cent_x(rect);
+ const float cent_x = mval_origin ?
+ CLAMPIS(mval_origin[0], rect->xmin + unit_size, rect->xmax - unit_size) :
+ BLI_rcti_cent_x(rect);
rect->ymax -= unit_half;
rect->ymin += unit_half;