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

[escher] Divide class selectable table view delegate in 2: selectable

Browse Source 
table view data source & selectable table view delegate

Change-Id: I90fbd61e271db3754c13bd0069b95c2026de6814
This commit is contained in:
Émilie Feral
2017-05-17 17:03:03 +02:00
parent 71284311bb
commit af4d6b6e81
54 changed files with 153 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
escher/src/scroll_view.cpp
View File

@@ -4,13 +4,13 @@ extern "C" {
#include <assert.h>
}
ScrollView::ScrollView(View * contentView, ScrollViewDelegate * delegate, KDCoordinate topMargin, KDCoordinate rightMargin,
ScrollView::ScrollView(View * contentView, ScrollViewDataSource * dataSource, KDCoordinate topMargin, KDCoordinate rightMargin,
KDCoordinate bottomMargin, KDCoordinate leftMargin, bool showIndicators, bool colorBackground,
KDColor backgroundColor, KDCoordinate indicatorThickness, KDColor indicatorColor,
KDColor backgroundIndicatorColor, KDCoordinate indicatorMargin) :
View(),
m_topMargin(topMargin),
m_delegate(delegate),
m_dataSource(dataSource),
m_contentView(contentView),
m_verticalScrollIndicator(ScrollViewIndicator::Direction::Vertical, indicatorColor, backgroundIndicatorColor, indicatorMargin),
m_horizontalScrollIndicator(ScrollViewIndicator::Direction::Horizontal, indicatorColor, backgroundIndicatorColor, indicatorMargin),
@@ -22,7 +22,7 @@ ScrollView::ScrollView(View * contentView, ScrollViewDelegate * delegate, KDCoor
m_colorBackground(colorBackground),
m_backgroundColor(backgroundColor)
{
assert(m_delegate != nullptr);
assert(m_dataSource != nullptr);
}
bool ScrollView::hasVerticalIndicator() const {
@@ -130,13 +130,13 @@ void ScrollView::updateScrollIndicator() {
}
void ScrollView::setContentOffset(KDPoint offset) {
if (m_delegate->setOffset(offset)) {
if (m_dataSource->setOffset(offset)) {
layoutSubviews();
}
}
KDPoint ScrollView::contentOffset() const {
return m_delegate->offset();
return m_dataSource->offset();
}
KDCoordinate ScrollView::topMargin() const {