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

Merge branch 'omega-hotfix' into omega-dev

Browse Source
This commit is contained in:
Quentin Guidée
2020-02-29 18:56:01 +01:00
parent 849c6e2559 33060d80c8
commit 83686568ad
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/code/app.cpp
View File

@@ -49,8 +49,10 @@ bool App::Snapshot::lockOnConsole() const {
}
void App::Snapshot::setOpt(const char * name, const char * value) {
if (strcmp(name, "script") == 0) {
if (strcmp(name, "wipe") == 0) {
m_scriptStore.deleteAllScripts();
}
if (strcmp(name, "script") == 0) {
char * separator = const_cast<char *>(UTF8Helper::CodePointSearch(value, ':'));
if (*separator == 0) {
return;

12
escher/src/text_area.cpp
View File

@@ -116,14 +116,18 @@ bool TextArea::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::ShiftUp || event == Ion::Events::ShiftDown) {
selectUpDown(event == Ion::Events::ShiftUp);
return true;
} else if (event == Ion::Events::ShiftLeft) {
} else if (event == Ion::Events::AlphaLeft) {
contentView()->moveCursorGeo(-INT_MAX/2, 0);
} else if (event == Ion::Events::ShiftRight) {
TextInput::scrollToCursor();
} else if (event == Ion::Events::AlphaRight) {
contentView()->moveCursorGeo(INT_MAX/2, 0);
} else if (event == Ion::Events::ShiftUp) {
TextInput::scrollToCursor();
} else if (event == Ion::Events::AlphaUp) {
contentView()->moveCursorGeo(0, -INT_MAX/2);
} else if (event == Ion::Events::ShiftDown) {
TextInput::scrollToCursor();
} else if (event == Ion::Events::AlphaDown) {
contentView()->moveCursorGeo(0, INT_MAX/2);
TextInput::scrollToCursor();
} else if (event == Ion::Events::Left) {
if (contentView()->resetSelection()) {
return true;

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

@@ -182,6 +182,11 @@ constexpr Event ShiftThree = Event::ShiftKey(Keyboard::Key::Three);
// Alpha
constexpr Event AlphaLeft = Event::AlphaKey(Keyboard::Key::Left);
constexpr Event AlphaRight = Event::AlphaKey(Keyboard::Key::Right);
constexpr Event AlphaUp = Event::AlphaKey(Keyboard::Key::Up);
constexpr Event AlphaDown = Event::AlphaKey(Keyboard::Key::Down);
constexpr Event Colon = Event::AlphaKey(Keyboard::Key::XNT);
constexpr Event SemiColon = Event::AlphaKey(Keyboard::Key::Var);
constexpr Event DoubleQuotes = Event::AlphaKey(Keyboard::Key::Toolbox);

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

@@ -30,7 +30,7 @@ static constexpr EventData s_dataForEvent[4*Event::PageSize] = {
TL(), TL(), TL(), TL(), TL(), U(),
TL(), TL(), TL(), TL(), U(), U(),
// Alpha
U(), U(), U(), U(), U(), U(),
TL(), TL(), TL(), TL(), U(), U(),
U(), U(), U(), U(), U(), U(),
U(), U(), T(":"), T(";"), T("\""), T("%"),
T("a"), T("b"), T("c"), T("d"), T("e"), T("f"),
@@ -75,7 +75,7 @@ static constexpr const char * s_nameForEvent[255] = {
nullptr, nullptr, nullptr, "BrightnessPlus", "BrightnessMinus", nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
//Alpha,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
"AlphaLeft", "AlphaUp", "AlphaDown", "AlphaRight", nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, "Colon", "SemiColon", "DoubleQuotes", "Percent",
"LowerA", "LowerB", "LowerC", "LowerD", "LowerE", "LowerF",

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

@@ -30,7 +30,7 @@ static constexpr EventData s_dataForEvent[4*Event::PageSize] = {
TL(), TL(), TL(), TL(), TL(), U(),
TL(), TL(), TL(), TL(), U(), U(),
// Alpha
U(), U(), U(), U(), U(), U(),
TL(), TL(), TL(), TL(), U(), U(),
U(), U(), U(), U(), U(), U(),
U(), U(), T(":"), T(";"), T("\""), T("%"),
T("a"), T("b"), T("c"), T("d"), T("e"), T("f"),
@@ -75,7 +75,7 @@ static constexpr const char * s_nameForEvent[255] = {
nullptr, nullptr, nullptr, "BrightnessPlus", "BrightnessMinus", nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
//Alpha,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
"AlphaLeft", "AlphaUp", "AlphaDown", "AlphaRight", nullptr, nullptr,
nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, "Colon", "SemiColon", "DoubleQuotes", "Percent",
"LowerA", "LowerB", "LowerC", "LowerD", "LowerE", "LowerF",