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

[escher/table_view] scrollToCell includes CellOverlap

Browse Source 
In passing, factorize duplicate code.
This commit is contained in:
Ruben Dashyan
2019-02-18 15:10:38 +01:00
committed by EmilieNumworks
parent 1ac829ca18
commit b5dc7f738e
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ protected:
/* realCellWidth enables to handle list view for which
* TableViewDataSource->cellWidht = 0 */
KDCoordinate columnWidth(int x) const;
KDRect cellFrame(int i, int j) const;
/* These two methods transform an index (of subview for instance) into
* coordinates that refer to the data source entire table */
int absoluteColumnNumberFromSubviewIndex(int index) const;

22
escher/src/table_view.cpp
View File

@@ -73,10 +73,14 @@ TableViewDataSource * TableView::ContentView::dataSource() {
return m_dataSource;
}
KDCoordinate TableView::ContentView::columnWidth(int i) const {
int columnWidth = m_dataSource->columnWidth(i);
KDRect TableView::ContentView::cellFrame(int i, int j) const {
KDCoordinate columnWidth = m_dataSource->columnWidth(i);
columnWidth = columnWidth ? columnWidth : m_tableView->maxContentWidthDisplayableWithoutScrolling();
return columnWidth;
return KDRect(
m_dataSource->cumulatedWidthFromIndex(i), m_dataSource->cumulatedHeightFromIndex(j),
columnWidth + m_horizontalCellOverlap,
m_dataSource->rowHeight(j) + m_verticalCellOverlap
);
}
KDCoordinate TableView::ContentView::height() const {
@@ -90,8 +94,7 @@ KDCoordinate TableView::ContentView::width() const {
}
void TableView::ContentView::scrollToCell(int x, int y) const {
KDRect cellRect = KDRect(m_dataSource->cumulatedWidthFromIndex(x), m_dataSource->cumulatedHeightFromIndex(y), columnWidth(x), m_dataSource->rowHeight(y));
m_tableView->scrollToContentRect(cellRect, true);
m_tableView->scrollToContentRect(cellFrame(x, y), true);
}
void TableView::ContentView::reloadCellAtLocation(int i, int j) {
@@ -172,14 +175,7 @@ void TableView::ContentView::layoutSubviews() {
int i = absoluteColumnNumberFromSubviewIndex(index);
int j = absoluteRowNumberFromSubviewIndex(index);
m_dataSource->willDisplayCellAtLocation((HighlightCell *)cell, i, j);
KDCoordinate rowHeight = m_dataSource->rowHeight(j);
KDCoordinate columnWidth = this->columnWidth(i);
KDCoordinate verticalOffset = m_dataSource->cumulatedHeightFromIndex(j);
KDCoordinate horizontalOffset = m_dataSource->cumulatedWidthFromIndex(i);
KDRect cellFrame(horizontalOffset, verticalOffset,
columnWidth+m_horizontalCellOverlap, rowHeight+m_verticalCellOverlap);
cell->setFrame(cellFrame);
cell->setFrame(cellFrame(i,j));
}
}