Use std::min and std::max, not the misc versions.
This commit is contained in:
@ -244,7 +244,7 @@ void Image::getExtremesSimpl (core::Extremes *extremes)
|
||||
correctExtremes (extremes, false);
|
||||
|
||||
extremes->adjustmentWidth =
|
||||
misc::min (extremes->minWidthIntrinsic, extremes->minWidth);
|
||||
std::min (extremes->minWidthIntrinsic, extremes->minWidth);
|
||||
}
|
||||
|
||||
void Image::sizeAllocateImpl (core::Allocation *allocation)
|
||||
@ -330,7 +330,7 @@ int Image::contentX (core::MousePositionEvent *event)
|
||||
{
|
||||
int ret = event->xWidget - boxOffsetX();
|
||||
|
||||
ret = misc::min(getContentWidth(), misc::max(ret, 0));
|
||||
ret = std::min(getContentWidth(), std::max(ret, 0));
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -338,7 +338,7 @@ int Image::contentY (core::MousePositionEvent *event)
|
||||
{
|
||||
int ret = event->yWidget - boxOffsetY();
|
||||
|
||||
ret = misc::min(getContentHeight(), misc::max(ret, 0));
|
||||
ret = std::min(getContentHeight(), std::max(ret, 0));
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user