nou/tenmon
1
0
Fork 1
Code Issues Pull Requests Projects Releases 33 Wiki Activity

Fix assert lo < hi in std::clamp

Browse Source
This commit is contained in:
Dušan Poizl
2023-04-19 14:33:29 +02:00
parent 2817d3c7c9
commit 21e90b92dc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imagescrollareagl.cpp
+3 -3
View File
@@ -253,11 +253,11 @@ void ImageWidget::setMTFParams(float low, float mid, float high)
void ImageWidget::setOffset(float dx, float dy) void ImageWidget::setOffset(float dx, float dy)
{ {
m_dx = std::clamp(dx, 0.0f, m_imgWidth * m_scale - m_width); m_dx = std::clamp(dx, 0.0f, std::max(0.0f, m_imgWidth * m_scale - m_width));
if(m_showThumbnails) if(m_showThumbnails)
m_dy = std::clamp(dy, 0.0f, (float)((m_thumbnailCount / (m_width / THUMB_SIZE_BORDER) + 2) * THUMB_SIZE_BORDER_Y - m_height)); m_dy = std::clamp(dy, 0.0f, std::max(0.0f, (float)((m_thumbnailCount / (m_width / THUMB_SIZE_BORDER) + 2) * THUMB_SIZE_BORDER_Y - m_height)));
else else
m_dy = std::clamp(dy, 0.0f, m_imgHeight * m_scale - m_height); m_dy = std::clamp(dy, 0.0f, std::max(0.0f, m_imgHeight * m_scale - m_height));
updateScrollBars(); updateScrollBars();
update(); update();
} }