UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[unicode] Use unicode when dealing with chars - Part 2

Browse Source
This commit is contained in:
Léa Saviot
2019-01-29 16:51:28 +01:00
committed by Émilie Feral
parent ac5311d257
commit 4c5251f04f
20 changed files with 186 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/code/python_toolbox.cpp
View File

@@ -330,9 +330,12 @@ bool PythonToolbox::handleEvent(Ion::Events::Event event) {
if (Toolbox::handleEvent(event)) {
return true;
}
if (event.hasText() && strlen(event.text()) == 1) {
scrollToLetter(event.text()[0]);
return true;
if (event.hasText() && strlen(event.text()) == 1 ) {
char c = event.text()[0];
if (UTF8Helper::CodePointIsLetter(c)) {
scrollToLetter(c);
return true;
}
}
return false;
}
@@ -389,24 +392,24 @@ int PythonToolbox::maxNumberOfDisplayedRows() {
}
void PythonToolbox::scrollToLetter(char letter) {
assert(UTF8Helper::CodePointIsLetter(letter));
/* We look for a child MessageTree that starts with the wanted letter. If we
* do not find one, we scroll to the first child MessageTree that starts with
* a letter higher than the wanted letter. */
char lowerLetter = tolower(letter);
// We look for a child MessageTree that starts with the wanted letter.
int index = -1;
for (int i = 0; i < m_messageTreeModel->numberOfChildren(); i++) {
char currentFirstLetterLowered = tolower(I18n::translate(m_messageTreeModel->children(i)->label())[0]);
if (currentFirstLetterLowered == lowerLetter) {
scrollToAndSelectChild(i);
return;
char l = tolower(I18n::translate(m_messageTreeModel->children(i)->label())[0]);
if (l == lowerLetter) {
index = i;
break;
}
if (index < 0 && l >= lowerLetter && UTF8Helper::CodePointIsLowerCaseLetter(l)) {
index = i;
}
}
// We did not find a child MessageTree that starts with the wanted letter.
// We scroll to the first child MessageTree that starts with a letter higher
// than the wanted letter.
for (int i = 0; i < m_messageTreeModel->numberOfChildren(); i++) {
char currentFirstLetterLowered = tolower(I18n::translate(m_messageTreeModel->children(i)->label())[0]);
if (currentFirstLetterLowered >= lowerLetter && currentFirstLetterLowered <= 'z') {
scrollToAndSelectChild(i);
return;
}
if (index >= 0) {
scrollToAndSelectChild(index);
}
}