UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-22 15:20:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher] in table view, handle cellWidth = 0

Browse Source 
Change-Id: Ib9efaa78e52e74a2b3e2904d776dc509c12a085b
This commit is contained in:
Émilie Feral
2016-09-28 11:24:50 +02:00
parent 97541b170c
commit 0c51c8aee1
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,9 @@ private:
View * subviewAtIndex(int index) override;
void layoutSubviews() override;
/* realCellWidth enables to handle list view for which
* TableViewDataSource->cellWidht = 0 */
KDCoordinate realCellWidth() const;
int numberOfFullyDisplayableRows() const;
int numberOfFullyDisplayableColumns() const;
int numberOfDisplayableRows() const;

27
escher/src/table_view.cpp
View File

@@ -53,12 +53,19 @@ TableView::ContentView::ContentView(TableView * tableView, TableViewDataSource *
{
}
KDCoordinate TableView::ContentView::realCellWidth() const {
int cellWidth = m_dataSource->cellWidth();
cellWidth = cellWidth ? cellWidth : m_tableView->maxContentWidthDisplayableWithoutScrolling();
return cellWidth;
}
KDCoordinate TableView::ContentView::height() const {
return m_dataSource->numberOfRows() * m_dataSource->cellHeight();
}
KDCoordinate TableView::ContentView::width() const {
return m_dataSource->numberOfColumns() * m_dataSource->cellWidth();
return m_dataSource->numberOfColumns() * realCellWidth();
}
void TableView::ContentView::scrollToCell(int x, int y) const {
@@ -66,10 +73,10 @@ void TableView::ContentView::scrollToCell(int x, int y) const {
KDCoordinate contentOffsetY = m_tableView->contentOffset().y();
if (columnAtIndexIsBeforeFullyVisibleRange(x)) {
// Let's scroll the tableView to put that cell on the left (while keeping the left margin)
contentOffsetX = x*m_dataSource->cellWidth();
contentOffsetX = x*realCellWidth();
} else if (columnAtIndexIsAfterFullyVisibleRange(x)) {
// Let's scroll the tableView to put that cell on the right (while keeping the right margin)
contentOffsetX = (x+1)*m_dataSource->cellWidth() - m_tableView->maxContentWidthDisplayableWithoutScrolling();
contentOffsetX = (x+1)*realCellWidth() - m_tableView->maxContentWidthDisplayableWithoutScrolling();
}
if (rowAtIndexIsBeforeFullyVisibleRange(y)) {
// Let's scroll the tableView to put that cell on the top (while keeping the top margin)
@@ -118,7 +125,7 @@ void TableView::ContentView::layoutSubviews() {
int x = i - y * columns;
KDCoordinate cellHeight = m_dataSource->cellHeight();
KDCoordinate cellWidth = m_dataSource->cellWidth();
KDCoordinate cellWidth = realCellWidth();
KDRect cellFrame((columnOffset+x)*cellWidth, (rowOffset+y)*cellHeight,
cellWidth, cellHeight);
@@ -146,9 +153,13 @@ int TableView::ContentView::numberOfDisplayableRows() const {
}
int TableView::ContentView::numberOfDisplayableColumns() const {
KDCoordinate width = realCellWidth();
if (width == 0) {
return 0;
}
return MIN(
m_dataSource->numberOfColumns(),
m_tableView->bounds().width()/m_dataSource->cellWidth() + 2
m_tableView->bounds().width()/width + 2
);
}
@@ -160,10 +171,14 @@ int TableView::ContentView::rowsScrollingOffset() const {
}
int TableView::ContentView::columnsScrollingOffset() const {
KDCoordinate width = realCellWidth();
if (width == 0) {
return 0;
}
/* Here, we want to translate the offset at which our tableView is displaying
* us into an integer offset we can use to ask cells to our data source. */
KDCoordinate pixelScrollingOffset = -m_frame.x();
return pixelScrollingOffset / m_dataSource->cellWidth();
return pixelScrollingOffset / width;
}
bool TableView::ContentView::rowAtIndexIsBeforeFullyVisibleRange(int index) const {