mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-04 08:46:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible std::clamp() assert fail

Browse Source
This commit is contained in:
David Capello 2022-07-07 16:08:40 -03:00
parent 1b76076c52
commit 8fe88606c6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ui/menu.cpp
View File

@ -872,9 +872,9 @@ bool MenuItem::onProcessMessage(Message* msg)
int x, y = bounds().y-3*guiscale();
Rect r1(0, 0, pos.w, pos.h), r2(0, 0, pos.w, pos.h);
r1.x = x_left = std::clamp(x_left, 0, ui::display_w()-pos.w);
r2.x = x_right = std::clamp(x_right, 0, ui::display_w()-pos.w);
r1.y = r2.y = y = std::clamp(y, 0, ui::display_h()-pos.h);
r1.x = x_left = std::clamp(x_left, 0, std::max(0, ui::display_w()-pos.w));
r2.x = x_right = std::clamp(x_right, 0, std::max(0, ui::display_w()-pos.w));
r1.y = r2.y = y = std::clamp(y, 0, std::max(0, ui::display_h()-pos.h));
// Calculate both intersections
gfx::Rect s1 = r1.createIntersection(old_pos);