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

[escher] add a boolean in table constructor to choose whether to paint

Browse Source 
the backgroung

Change-Id: Idee8aff20ab86011775e9a995a2d2f425b60df67
This commit is contained in:
Émilie Feral
2016-12-06 15:27:06 +01:00
parent 9f18606926
commit 37da7b95a2
6 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
escher/src/scroll_view.cpp
View File

@@ -1,5 +1,4 @@
#include <escher/scroll_view.h>
#include <escher/palette.h>
extern "C" {
#include <assert.h>
@@ -8,7 +7,8 @@ extern "C" {
constexpr KDCoordinate ScrollView::k_indicatorThickness;
ScrollView::ScrollView(View * contentView, KDCoordinate topMargin, KDCoordinate rightMargin,
KDCoordinate bottomMargin, KDCoordinate leftMargin, bool showIndicators) :
KDCoordinate bottomMargin, KDCoordinate leftMargin, bool showIndicators, bool colorBackground,
KDColor backgroundColor) :
View(),
m_topMargin(topMargin),
m_offset(KDPointZero),
@@ -18,9 +18,12 @@ ScrollView::ScrollView(View * contentView, KDCoordinate topMargin, KDCoordinate
m_rightMargin(rightMargin),
m_bottomMargin(bottomMargin),
m_leftMargin(leftMargin),
m_showIndicators(showIndicators)
m_showIndicators(showIndicators),
m_colorBackground(colorBackground),
m_backgroundColor(backgroundColor)
{
}
bool ScrollView::hasVerticalIndicator() const {
if (m_showIndicators) {
return m_verticalScrollIndicator.end() < 1 || m_verticalScrollIndicator.start() > 0;
@@ -52,9 +55,12 @@ View * ScrollView::subviewAtIndex(int index) {
}
void ScrollView::drawRect(KDContext * ctx, KDRect rect) const {
if (!m_colorBackground) {
return;
}
KDCoordinate width = bounds().width();
KDCoordinate height = bounds().height();
ctx->fillRect(KDRect(0, 0, width, height), Palette::BackgroundColor);
ctx->fillRect(KDRect(0, 0, width, height), m_backgroundColor);
// Future optimization: avoid drawing behind the content view/
//ctx->fillRect(KDRect(m_leftMargin, m_contentView->bounds().height()+m_topMargin, width-m_leftMargin-m_rightMargin, height- m_contentView->bounds().height())-m_topMargin, Palette::BackgroundColor);
}