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

[poincare/layout_field] Select up/down

Browse Source
This commit is contained in:
Léa Saviot
2019-12-19 11:22:57 +01:00
parent efc8a238ea
commit 5c2ea9899d
5 changed files with 98 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
escher/src/layout_field.cpp
View File

@@ -469,21 +469,24 @@ bool LayoutField::privateHandleMoveEvent(Ion::Events::Event event, bool * should
return false;
}
bool eventIsSelection(Ion::Events::Event event) {
return event == Ion::Events::ShiftLeft || event == Ion::Events::ShiftRight || event == Ion::Events::ShiftUp || event == Ion::Events::ShiftDown;
}
bool LayoutField::privateHandleSelectionEvent(Ion::Events::Event event, bool * shouldRecomputeLayout) {
LayoutCursor result;
if (event == Ion::Events::ShiftLeft || event == Ion::Events::ShiftRight) {
if (eventIsSelection(event)) {
Layout addedSelection;
result = m_contentView.cursor()->selectAtDirection(event == Ion::Events::ShiftLeft ? LayoutCursor::MoveDirection::Left : LayoutCursor::MoveDirection::Right, shouldRecomputeLayout, &addedSelection);
if (!addedSelection.isUninitialized()) { //TODO LEA assert?
m_contentView.addSelection(addedSelection);
} else {
LayoutCursor::MoveDirection direction = event == Ion::Events::ShiftLeft ? LayoutCursor::MoveDirection::Left :
(event == Ion::Events::ShiftRight ? LayoutCursor::MoveDirection::Right :
(event == Ion::Events::ShiftUp ? LayoutCursor::MoveDirection::Up :
LayoutCursor::MoveDirection::Down));
result = m_contentView.cursor()->selectAtDirection(direction, shouldRecomputeLayout, &addedSelection);
if (addedSelection.isUninitialized()) {
return false;
}
}/* else if (event == Ion::Events::ShiftUp) {
//TODO LEA result = m_contentView.cursor()->cursorAtDirection(LayoutCursor::MoveDirection::Up, shouldRecomputeLayout);
} else if (event == Ion::Events::ShiftDown) {
//TODO LEA result = m_contentView.cursor()->cursorAtDirection(LayoutCursor::MoveDirection::Down, shouldRecomputeLayout);
}*/
m_contentView.addSelection(addedSelection);
}
if (result.isDefined()) {
m_contentView.setCursor(result);
return true;