blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Fix T63681: bad clipping of very long tooltips

This commit is contained in:
Brecht Van Lommel 2019-04-21 01:22:07 +02:00
parent 92d93dd935
commit a5d5f152dd
Notes: blender-bot 2023-02-14 11:34:30 +01:00 
Referenced by issue #63681, Report a Bug popup
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/blenlib/intern/rct.c
View File

@ -700,6 +700,9 @@ bool BLI_rcti_clamp_pt_v(const rcti *rect, int xy[2])
/**
* Clamp \a rect within \a rect_bounds, setting \a r_xy to the offset.
*
* Keeps the top left corner within the bounds, which for user interface
* elements is typically where the most important information is.
*
* \return true if a change is made.
*/
bool BLI_rctf_clamp(rctf *rect, const rctf *rect_bounds, float r_xy[2])
@ -709,16 +712,16 @@ bool BLI_rctf_clamp(rctf *rect, const rctf *rect_bounds, float r_xy[2])
r_xy[0] = 0.0f;
r_xy[1] = 0.0f;
if (rect->xmin < rect_bounds->xmin) {
float ofs = rect_bounds->xmin - rect->xmin;
if (rect->xmax > rect_bounds->xmax) {
float ofs = rect_bounds->xmax - rect->xmax;
rect->xmin += ofs;
rect->xmax += ofs;
r_xy[0] += ofs;
changed = true;
}
if (rect->xmax > rect_bounds->xmax) {
float ofs = rect_bounds->xmax - rect->xmax;
if (rect->xmin < rect_bounds->xmin) {
float ofs = rect_bounds->xmin - rect->xmin;
rect->xmin += ofs;
rect->xmax += ofs;
r_xy[0] += ofs;
@ -751,16 +754,16 @@ bool BLI_rcti_clamp(rcti *rect, const rcti *rect_bounds, int r_xy[2])
r_xy[0] = 0;
r_xy[1] = 0;
if (rect->xmin < rect_bounds->xmin) {
int ofs = rect_bounds->xmin - rect->xmin;
if (rect->xmax > rect_bounds->xmax) {
int ofs = rect_bounds->xmax - rect->xmax;
rect->xmin += ofs;
rect->xmax += ofs;
r_xy[0] += ofs;
changed = true;
}
if (rect->xmax > rect_bounds->xmax) {
int ofs = rect_bounds->xmax - rect->xmax;
if (rect->xmin < rect_bounds->xmin) {
int ofs = rect_bounds->xmin - rect->xmin;
rect->xmin += ofs;
rect->xmax += ofs;
r_xy[0] += ofs;