UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-21 14:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher/layout_field] Remove selection on simple left/right/up/down

Browse Source
This commit is contained in:
Léa Saviot
2019-11-19 11:09:37 +01:00
parent b9a8f12f25
commit 03f07d65ed
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
escher/include/escher/layout_field.h
View File

@@ -44,7 +44,7 @@ public:
}
// Selection
void resetSelection() { m_contentView.resetSelection(); }
bool resetSelection() { return m_contentView.resetSelection(); }
void deleteSelection();
private:

17
escher/src/layout_field.cpp
View File

@@ -376,7 +376,21 @@ bool LayoutField::privateHandleEvent(Ion::Events::Event event) {
return false;
}
static inline bool IsSimpleMoveEvent(Ion::Events::Event event) {
return event == Ion::Events::Left
|| event == Ion::Events::Right
|| event == Ion::Events::Up
|| event == Ion::Events::Down;
}
bool LayoutField::privateHandleMoveEvent(Ion::Events::Event event, bool * shouldRecomputeLayout) {
if (!IsSimpleMoveEvent(event)) {
return false;
}
if (resetSelection()) {
*shouldRecomputeLayout = true;
return true;
}
LayoutCursor result;
if (event == Ion::Events::Left) {
result = m_contentView.cursor()->cursorAtDirection(LayoutCursor::MoveDirection::Left, shouldRecomputeLayout);
@@ -384,7 +398,8 @@ bool LayoutField::privateHandleMoveEvent(Ion::Events::Event event, bool * should
result = m_contentView.cursor()->cursorAtDirection(LayoutCursor::MoveDirection::Right, shouldRecomputeLayout);
} else if (event == Ion::Events::Up) {
result = m_contentView.cursor()->cursorAtDirection(LayoutCursor::MoveDirection::Up, shouldRecomputeLayout);
} else if (event == Ion::Events::Down) {
} else {
assert(event == Ion::Events::Down);
result = m_contentView.cursor()->cursorAtDirection(LayoutCursor::MoveDirection::Down, shouldRecomputeLayout);
}
if (result.isDefined()) {