Merge branch 'MihailRis:main' into main

This commit is contained in:
Astazium 2026-08-26 00:05:39 +03:00 • committed by GitHub
commit a2c9e494d0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 127 additions and 55 deletions

View file

@ -39,15 +39,24 @@ glm::vec2 Panel::getContentSize() const {
}
void Panel::cropToContent() {
int maxInt = std::numeric_limits<int>::max();
bool isHorizontal = orientation == Orientation::HORIZONTAL;
int minLengthX = isHorizontal ? minLength : 0;
int maxLengthX = isHorizontal ? maxLength : maxInt;
int minLengthY = isHorizontal ? 0 : minLength;
int maxLengthY = isHorizontal ? maxInt : maxLength;
if (maxLength > 0.0f) {
setSize(glm::vec2(
glm::max(minLength, glm::min(maxLength, actualLengthX)),
glm::max(minLength, glm::min(maxLength, actualLengthY))
glm::max(minLengthX, glm::min(maxLengthX, actualLengthX)),
glm::max(minLengthY, glm::min(maxLengthY, actualLengthY))
));
} else {
setSize(glm::vec2(
glm::max(minLength, actualLengthX),
glm::max(minLength, actualLengthY)
glm::max(minLengthX, actualLengthX),
glm::max(minLengthY, actualLengthY)
));
}
}