mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-07-31 05:30:23 +02:00
Code Issues Projects Releases Wiki Activity

Fix Rect::operator & (intersection)

Browse Source 
Completely neglected to normalize the Rect's size. Somehow completely asymptomatic unless looking at the favourites menu if it's too long to fit on the screen, on MacOS. Yeah.

Another in the series of fixes for easily avoidable problems introduced in c2bb777212 by my infinite wisdom >_>. The previous (and thankfully, first) commit in the series is 8cab4ab738.
This commit is contained in:
Tamás Bálint Misius
2024-12-30 15:19:54 +01:00
parent a32f0fe178
commit 6dd0e9533f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/Vec2.h
View File

@@ -367,7 +367,8 @@ public:
{ {
auto tl = Vec2<T>(std::max(pos.X , other.pos.X ), std::max(pos.Y , other.pos.Y )); auto tl = Vec2<T>(std::max(pos.X , other.pos.X ), std::max(pos.Y , other.pos.Y ));
auto br1 = Vec2<T>(std::min(pos.X + size.X, other.pos.X + other.size.X), std::min(pos.Y + size.Y, other.pos.Y + other.size.Y)); auto br1 = Vec2<T>(std::min(pos.X + size.X, other.pos.X + other.size.X), std::min(pos.Y + size.Y, other.pos.Y + other.size.Y));
return Rect<T>(tl, br1 - tl); auto size = br1 - tl;
return Rect<T>(tl, Vec2<T>(std::max(size.X, T(0)), std::max(size.Y, T(0))));
} }
inline Rect<T> &operator&=(Rect<T> other) inline Rect<T> &operator&=(Rect<T> other)