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

Fix conflicts

Browse Source
This commit is contained in:
Quentin Guidée
2019-12-24 17:33:32 +01:00
parent be8085eaf8 9a813b8dfb
commit 85c98cefe5
6 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
escher/src/layout_field.cpp
View File

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

10
escher/src/text_area.cpp
View File

@@ -112,8 +112,6 @@ bool TextArea::handleEvent(Ion::Events::Event event) {
contentView()->moveCursorGeo(INT_MAX/2, 0);
} else if (event == Ion::Events::Backspace) {
return removePreviousGlyph();
} else if (event.hasText()) {
return handleEventWithText(event.text());
} else if (event == Ion::Events::EXE) {
return handleEventWithText("\n");
} else if (event == Ion::Events::Clear) {
@@ -122,6 +120,14 @@ bool TextArea::handleEvent(Ion::Events::Event event) {
}
} else if (event == Ion::Events::Paste) {
return handleEventWithText(Clipboard::sharedClipboard()->storedText());
} 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());
}
} else {
return false;
}

3
ion/include/ion/events.h
View File

@@ -55,6 +55,7 @@ ShiftAlphaStatus shiftAlphaStatus();
void setShiftAlphaStatus(ShiftAlphaStatus s);
bool isShiftActive();
bool isAlphaActive();
bool isLockActive();
void updateModifiersFromEvent(Event e);
// Plain
@@ -180,6 +181,7 @@ constexpr Event ShiftThree = Event::ShiftKey(Keyboard::Key::Three);
constexpr Event Colon = Event::AlphaKey(Keyboard::Key::XNT);
constexpr Event SemiColon = Event::AlphaKey(Keyboard::Key::Var);
constexpr Event DoubleQuotes = Event::AlphaKey(Keyboard::Key::Toolbox);
constexpr Event Percent = Event::AlphaKey(Keyboard::Key::Back);
constexpr Event LowerA = Event::AlphaKey(Keyboard::Key::Exp);
constexpr Event LowerB = Event::AlphaKey(Keyboard::Key::Ln);
@@ -218,7 +220,6 @@ constexpr Event Exclamation = Event::AlphaKey(Keyboard::Key::Dot);
constexpr Event alphaans = Event::AlphaKey(Keyboard::Key::Ans);
// Shift + Alpha
constexpr Event Percent = Event::ShiftAlphaKey(Keyboard::Key::Back);
constexpr Event SimpleQuote = Event::ShiftAlphaKey(Keyboard::Key::Toolbox);
constexpr Event UpperA = Event::ShiftAlphaKey(Keyboard::Key::Exp);

2
ion/include/ion/keyboard/layout_B2/layout_events.h
View File

@@ -87,7 +87,7 @@ static constexpr const char * s_nameForEvent[255] = {
//Shift+Alpha,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, "Percent",
"UpperA", "UpperB", "UpperC", "UpperD", "UpperE", "UpperF",
"UpperG", "UpperH", "UpperI", "UpperJ", "UpperK", "UpperL",
"UpperM", "UpperN", "UpperO", "UpperP", "UpperQ", nullptr,

2
ion/include/ion/keyboard/layout_B3/layout_events.h
View File

@@ -87,7 +87,7 @@ static constexpr const char * s_nameForEvent[255] = {
//Shift+Alpha,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, "Percent",
"UpperA", "UpperB", "UpperC", "UpperD", "UpperE", "UpperF",
"UpperG", "UpperH", "UpperI", "UpperJ", "UpperK", "UpperL",
"UpperM", "UpperN", "UpperO", "UpperP", "UpperQ", nullptr,

4
ion/src/shared/events_modifier.cpp
View File

@@ -18,6 +18,10 @@ bool isAlphaActive() {
return sShiftAlphaStatus == ShiftAlphaStatus::Alpha || sShiftAlphaStatus == ShiftAlphaStatus::ShiftAlpha || sShiftAlphaStatus == ShiftAlphaStatus::AlphaLock || sShiftAlphaStatus == ShiftAlphaStatus::ShiftAlphaLock;
;
}
bool isLockActive() {
return sShiftAlphaStatus == ShiftAlphaStatus::AlphaLock || sShiftAlphaStatus == ShiftAlphaStatus::ShiftAlphaLock;
}
void setShiftAlphaStatus(ShiftAlphaStatus s) {
sShiftAlphaStatus = s;