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

6
dw/textblock_iterator.cc
View File

@ -217,7 +217,7 @@ void Textblock::TextblockIterator::getAllocation (int start, int end,
bool regardBorder =
textblock->mustBorderBeRegarded (textblock->lines->size ());
textOffset =
misc::max (regardBorder ? textblock->newLineLeftBorder : 0,
std::max (regardBorder ? textblock->newLineLeftBorder : 0,
textblock->boxOffsetX () + textblock->leftInnerPadding
+ (textblock->lines->size () == 0 ?
textblock->line1OffsetEff : 0));
@ -231,7 +231,7 @@ void Textblock::TextblockIterator::getAllocation (int start, int end,
w->content.type == core::Content::WIDGET_IN_FLOW ?
w->size.ascent - w->content.widget->getStyle()->margin.top :
w->size.ascent;
lineBorderAscent = misc::max (lineBorderAscent, borderAscent);
lineBorderAscent = std::max (lineBorderAscent, borderAscent);
}
}
@ -255,7 +255,7 @@ void Textblock::TextblockIterator::getAllocation (int start, int end,
int wordEnd = strlen(word->content.text);
if (start > 0 || end < wordEnd) {
end = misc::min(end, wordEnd); /* end could be INT_MAX */
end = std::min(end, wordEnd); /* end could be INT_MAX */
allocation->width =
textblock->textWidth (word->content.text, start, end - start,
word->style,