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

[poincare/matrix_layout] Remove columns with backspace

Browse Source 
Allow removing empty columns with backspace, the same way one can remove
empty rows. This allows deleting the internal columns that are not
automatically deleted.

Change-Id: I52def7939257942a8396721d01c4d1531ef90361
This commit is contained in:
Gabriel Ozouf
2020-11-12 12:21:06 +01:00
committed by LeaNumworks
parent 7184202a6e
commit 323e72a50c
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
poincare/src/matrix_layout.cpp
View File

@@ -92,20 +92,32 @@ void MatrixLayoutNode::willAddSiblingToEmptyChildAtIndex(int childIndex) {
}
void MatrixLayoutNode::deleteBeforeCursor(LayoutCursor * cursor) {
// Deleting the left empty layout of an empty row deletes the row
/* Deleting the left empty layout of an empty row deletes the row, and
* deleting the top empty layout of an empty column deletes the column. */
assert(cursor != nullptr);
LayoutNode * pointedChild = cursor->layoutNode();
if (pointedChild->isEmpty()) {
int indexOfPointedLayout = indexOfChild(pointedChild);
if (columnAtChildIndex(indexOfPointedLayout) == 0) {
int rowIndex = rowAtChildIndex(indexOfPointedLayout);
int columnIndex = columnAtChildIndex(indexOfPointedLayout);
int rowIndex = rowAtChildIndex(indexOfPointedLayout);
bool deleted = false;
if (columnIndex == 0) {
if (rowIndex < m_numberOfRows - 1 && isRowEmpty(rowIndex) && m_numberOfRows > 2) {
deleteRowAtIndex(rowIndex);
deleted = true;
}
}
if (rowIndex == 0) {
if (columnIndex < m_numberOfColumns - 1 && isColumnEmpty(columnIndex) && m_numberOfColumns > 2) {
deleteColumnAtIndex(columnIndex);
deleted = true;
}
}
if (deleted) {
assert(indexOfPointedLayout >= 0 && indexOfPointedLayout < m_numberOfColumns*m_numberOfRows);
cursor->setLayoutNode(childAtIndex(indexOfPointedLayout));
cursor->setPosition(LayoutCursor::Position::Right);
return;
}
}
}
GridLayoutNode::deleteBeforeCursor(cursor);