adam/flenser
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use std::min and std::max, not the misc versions.

Browse Source
This commit is contained in:
ADAM David Alan Martin
2025-08-10 17:08:42 -04:00
parent 6c3bf19bbd
commit 640ccd02d3
26 changed files with 216 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dw/bullet.cc
View File

@ -37,8 +37,8 @@ Bullet::~Bullet ()
void Bullet::sizeRequestSimpl (core::Requisition *requisition)
{
requisition->width = lout::misc::max (getStyle()->font->xHeight * 4 / 5, 1);
requisition->ascent = lout::misc::max (getStyle()->font->xHeight, 1);
requisition->width = std::max (getStyle()->font->xHeight * 4 / 5, 1);
requisition->ascent = std::max (getStyle()->font->xHeight, 1);
requisition->descent = 0;
}
@ -46,7 +46,7 @@ void Bullet::getExtremesSimpl (core::Extremes *extremes)
{
extremes->minWidth = extremes->maxWidth = extremes->adjustmentWidth =
extremes->minWidthIntrinsic = extremes->maxWidthIntrinsic =
lout::misc::max (getStyle()->font->xHeight * 4 / 5, 1);
std::max (getStyle()->font->xHeight * 4 / 5, 1);
}
void Bullet::containerSizeChangedForChildren ()
@ -62,7 +62,7 @@ void Bullet::draw (core::View *view, core::Rectangle *area,
int x, y, l;
bool filled = true;
l = lout::misc::min (allocation.width, allocation.ascent);
l = std::min (allocation.width, allocation.ascent);
x = allocation.x;
y = allocation.y + allocation.ascent - getStyle()->font->xHeight;