UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher/text_field] Fix std::min use

Browse Source
This commit is contained in:
Léa Saviot
2020-04-22 14:57:39 +02:00
committed by Émilie Feral
parent 5393ec7273
commit 0f2ac5b110
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/code/python_text_area.cpp
View File

@@ -188,7 +188,7 @@ void PythonTextArea::ContentView::drawLine(KDContext * ctx, int line, const char
line,
UTF8Helper::GlyphOffsetAtCodePoint(text, autocompleteStart),
autocompleteStart,
minPointer(text + byteLength, autocompleteEnd) - autocompleteStart,
std::min(text + byteLength, autocompleteEnd) - autocompleteStart,
AutocompleteColor,
BackgroundColor,
nullptr,

4
escher/src/text_field.cpp
View File

@@ -122,7 +122,7 @@ void TextField::ContentView::reinitDraftTextBuffer() {
bool TextField::ContentView::insertTextAtLocation(const char * text, char * location, int textLen) {
assert(m_isEditing);
int textLength = textLen < 0 ? strlen(text) : textLen;
size_t textLength = textLen < 0 ? strlen(text) : (size_t)textLen;
if (m_currentDraftTextLength + textLength >= m_draftTextBufferSize || textLength == 0) {
return false;
}
@@ -130,7 +130,7 @@ bool TextField::ContentView::insertTextAtLocation(const char * text, char * loca
memmove(location + textLength, location, (s_draftTextBuffer + m_currentDraftTextLength + 1) - location);
// Caution! One byte will be overridden by the null-terminating char of strlcpy
size_t copySize = std::min(textLength + 1, (s_draftTextBuffer + m_draftTextBufferSize) - location);
size_t copySize = std::min(textLength + 1, static_cast<size_t>((s_draftTextBuffer + m_draftTextBufferSize) - location));
char * overridenByteLocation = location + copySize - 1;
char overridenByte = *overridenByteLocation;
strlcpy(location, text, copySize);