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

Merge branch 'RevertPercent' of https://github.com/RedGl0w/epsilon into RedGl0w-RevertPercent

Browse Source
This commit is contained in:
Quentin
2020-04-16 14:05:11 +02:00
parent f37040dc8a 53743ab531
commit a7a212c652
3 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
escher/src/layout_field.cpp
View File

@@ -500,11 +500,7 @@ bool LayoutField::privateHandleEvent(Ion::Events::Event event) {
setEditing(true);
}
if (event.hasText()) {
if(event.text() == "%" && Ion::Events::isLockActive() ){
m_contentView.cursor()->performBackspace();
} else {
handleEventWithText(event.text());
}
handleEventWithText(event.text());
} else if (event == Ion::Events::Paste) {
handleEventWithText(Clipboard::sharedClipboard()->storedText(), false, true);
} else {

6
escher/src/text_area.cpp
View File

@@ -191,11 +191,7 @@ bool TextArea::handleEvent(Ion::Events::Event event) {
} else if (event == Ion::Events::Percent) {
return removePreviousGlyph();
} else if (event.hasText()) {
if(event.text() == "%" && Ion::Events::isLockActive()){
return removePreviousGlyph();
} else {
return handleEventWithText(event.text());
}
return handleEventWithText(event.text());
} else {
return false;
}

5
escher/src/text_field.cpp
View File

@@ -414,11 +414,6 @@ CodePoint TextField::XNTCodePoint(CodePoint defaultXNTCodePoint) {
}
bool TextField::handleEvent(Ion::Events::Event event) {
if(event.hasText()){
if(event.text() == "%" && Ion::Events::isLockActive() ){
return removePreviousGlyph();
}
}
assert(m_delegate != nullptr);
size_t previousTextLength = strlen(text());
bool didHandleEvent = false;