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

[escher] add a boolean in scrollview to decide wether to display scroll

Browse Source 
indicators

Change-Id: I6bc34519668fc73fecf2207596951c3b3a9c8311
This commit is contained in:
Émilie Feral
2016-10-27 12:10:07 +02:00
parent a9f8628d2b
commit 54a29ef60c
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/calculation/pretty_print_view.cpp
View File

@@ -4,7 +4,7 @@
namespace Calculation {
PrettyPrintView::PrettyPrintView(Responder * parentResponder) :
ScrollView(&m_expressionView),
ScrollView(&m_expressionView, 0, 0, 0, 0, false),
Responder(parentResponder),
m_expressionView(ExpressionView()),
m_manualScrolling(0)

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

@@ -7,7 +7,7 @@
class ScrollView : public View {
public:
ScrollView(View * contentView, KDCoordinate topMargin = 0, KDCoordinate rightMargin = 0,
KDCoordinate bottomMargin = 0, KDCoordinate leftMargin = 0);
KDCoordinate bottomMargin = 0, KDCoordinate leftMargin = 0, bool showIndicators = true);
void setContentOffset(KDPoint offset);
KDPoint contentOffset();
@@ -38,6 +38,7 @@ private:
KDCoordinate m_rightMargin;
KDCoordinate m_bottomMargin;
KDCoordinate m_leftMargin;
bool m_showIndicators;
};
#endif

38
escher/src/scroll_view.cpp
View File

@@ -7,7 +7,8 @@ extern "C" {
constexpr KDCoordinate ScrollView::k_indicatorThickness;
ScrollView::ScrollView(View * contentView, KDCoordinate topMargin, KDCoordinate rightMargin, KDCoordinate bottomMargin, KDCoordinate leftMargin) :
ScrollView::ScrollView(View * contentView, KDCoordinate topMargin, KDCoordinate rightMargin,
KDCoordinate bottomMargin, KDCoordinate leftMargin, bool showIndicators) :
View(),
m_offset(KDPointZero),
m_contentView(contentView),
@@ -16,15 +17,22 @@ ScrollView::ScrollView(View * contentView, KDCoordinate topMargin, KDCoordinate
m_topMargin(topMargin),
m_rightMargin(rightMargin),
m_bottomMargin(bottomMargin),
m_leftMargin(leftMargin)
m_leftMargin(leftMargin),
m_showIndicators(showIndicators)
{
}
bool ScrollView::hasVerticalIndicator() const {
return m_verticalScrollIndicator.end() < 1 || m_verticalScrollIndicator.start() > 0;
if (m_showIndicators) {
return m_verticalScrollIndicator.end() < 1 || m_verticalScrollIndicator.start() > 0;
}
return false;
}
bool ScrollView::hasHorizontalIndicator() const {
return m_horizontalScrollIndicator.end() < 1 || m_horizontalScrollIndicator.start() > 0;
if (m_showIndicators) {
return m_horizontalScrollIndicator.end() < 1 || m_horizontalScrollIndicator.start() > 0;
}
return false;
}
int ScrollView::numberOfSubviews() const {
@@ -95,16 +103,18 @@ void ScrollView::layoutSubviews() {
}
void ScrollView::updateScrollIndicator() {
float contentHeight = m_contentView->bounds().height()+m_topMargin+m_bottomMargin;
float verticalStart = m_offset.y();
float verticalEnd = m_offset.y() + m_frame.height();
m_verticalScrollIndicator.setStart(verticalStart/contentHeight);
m_verticalScrollIndicator.setEnd(verticalEnd/contentHeight);
float contentWidth = m_contentView->bounds().width()+m_leftMargin+m_rightMargin;
float horizontalStart = m_offset.x();
float horizontalEnd = m_offset.x() + m_frame.width();
m_horizontalScrollIndicator.setStart(horizontalStart/contentWidth);
m_horizontalScrollIndicator.setEnd(horizontalEnd/contentWidth);
if (m_showIndicators) {
float contentHeight = m_contentView->bounds().height()+m_topMargin+m_bottomMargin;
float verticalStart = m_offset.y();
float verticalEnd = m_offset.y() + m_frame.height();
m_verticalScrollIndicator.setStart(verticalStart/contentHeight);
m_verticalScrollIndicator.setEnd(verticalEnd/contentHeight);
float contentWidth = m_contentView->bounds().width()+m_leftMargin+m_rightMargin;
float horizontalStart = m_offset.x();
float horizontalEnd = m_offset.x() + m_frame.width();
m_horizontalScrollIndicator.setStart(horizontalStart/contentWidth);
m_horizontalScrollIndicator.setEnd(horizontalEnd/contentWidth);
}
}
void ScrollView::setContentOffset(KDPoint offset) {