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

[apps] Changes names in ScrollableExactApproximateExpressionsView

Browse Source
This commit is contained in:
Léa Saviot
2018-11-08 14:37:41 +01:00
committed by Émilie Feral
parent 667d373806
commit 52d8192306
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/shared/scrollable_exact_approximate_expressions_view.cpp
View File

@@ -9,7 +9,7 @@ ScrollableExactApproximateExpressionsView::ContentCell::ContentCell() :
m_rightExpressionView(),
m_approximateSign(KDFont::LargeFont, I18n::Message::AlmostEqual, 0.5f, 0.5f, Palette::GreyVeryDark),
m_leftExpressionView(),
m_selectedSubviewType((SubviewType)0)
m_selectedSubviewPosition((SubviewPosition)0)
{
}
@@ -24,7 +24,7 @@ void ScrollableExactApproximateExpressionsView::ContentCell::setHighlighted(bool
m_leftExpressionView.setBackgroundColor(backgroundColor());
m_rightExpressionView.setBackgroundColor(backgroundColor());
if (highlight) {
if (m_selectedSubviewType == SubviewType::ExactOutput) {
if (m_selectedSubviewPosition == SubviewPosition::Left) {
m_leftExpressionView.setBackgroundColor(Palette::Select);
} else {
m_rightExpressionView.setBackgroundColor(Palette::Select);
@@ -56,13 +56,13 @@ KDSize ScrollableExactApproximateExpressionsView::ContentCell::minimalSizeForOpt
return KDSize(leftExpressionSize.width()+approximateSignSize.width()+rightExpressionSize.width()+2*k_digitHorizontalMargin, height);
}
void ScrollableExactApproximateExpressionsView::ContentCell::setSelectedSubviewType(ScrollableExactApproximateExpressionsView::SubviewType subviewType) {
m_selectedSubviewType = subviewType;
void ScrollableExactApproximateExpressionsView::ContentCell::setSelectedSubviewPosition(ScrollableExactApproximateExpressionsView::SubviewPosition subviewPosition) {
m_selectedSubviewPosition = subviewPosition;
setHighlighted(isHighlighted());
}
Poincare::Layout ScrollableExactApproximateExpressionsView::ContentCell::layout() const {
if (m_selectedSubviewType == SubviewType::ExactOutput) {
if (m_selectedSubviewPosition == SubviewPosition::Left) {
return m_leftExpressionView.layout();
} else {
return m_rightExpressionView.layout();
@@ -116,9 +116,9 @@ void ScrollableExactApproximateExpressionsView::setEqualMessage(I18n::Message eq
void ScrollableExactApproximateExpressionsView::didBecomeFirstResponder() {
if (m_contentCell.leftExpressionView()->layout().isUninitialized()) {
setSelectedSubviewType(SubviewType::ApproximativeOutput);
setSelectedSubviewPosition(SubviewPosition::Right);
} else {
setSelectedSubviewType(SubviewType::ExactOutput);
setSelectedSubviewPosition(SubviewPosition::Left);
}
}
@@ -129,10 +129,10 @@ bool ScrollableExactApproximateExpressionsView::handleEvent(Ion::Events::Event e
bool rightExpressionIsVisible = minimalSizeForOptimalDisplay().width() - m_contentCell.rightExpressionView()->minimalSizeForOptimalDisplay().width() - m_manualScrollingOffset.x() < bounds().width()
;
bool leftExpressionIsVisible = m_contentCell.leftExpressionView()->minimalSizeForOptimalDisplay().width() - m_manualScrollingOffset.x() > 0;
if ((event == Ion::Events::Right && selectedSubviewType() == SubviewType::ExactOutput && rightExpressionIsVisible) ||
(event == Ion::Events::Left && selectedSubviewType() == SubviewType::ApproximativeOutput && leftExpressionIsVisible)) {
SubviewType otherSubviewType = selectedSubviewType() == SubviewType::ExactOutput ? SubviewType::ApproximativeOutput : SubviewType::ExactOutput;
setSelectedSubviewType(otherSubviewType);
if ((event == Ion::Events::Right && selectedSubviewPosition() == SubviewPosition::Left && rightExpressionIsVisible) ||
(event == Ion::Events::Left && selectedSubviewPosition() == SubviewPosition::Right && leftExpressionIsVisible)) {
SubviewPosition otherSubviewPosition = selectedSubviewPosition() == SubviewPosition::Left ? SubviewPosition::Right : SubviewPosition::Left;
setSelectedSubviewPosition(otherSubviewPosition);
return true;
}
return ScrollableView::handleEvent(event);

22
apps/shared/scrollable_exact_approximate_expressions_view.h
View File

@@ -7,9 +7,9 @@ namespace Shared {
class ScrollableExactApproximateExpressionsView : public ScrollableView, public ScrollViewDataSource {
public:
enum class SubviewType {
ExactOutput,
ApproximativeOutput
enum class SubviewPosition {
Left,
Right
};
ScrollableExactApproximateExpressionsView(Responder * parentResponder);
::EvenOddCell * evenOddCell() {
@@ -17,11 +17,11 @@ public:
}
void setLayouts(Poincare::Layout rightlayout, Poincare::Layout leftLayout);
void setEqualMessage(I18n::Message equalSignMessage);
SubviewType selectedSubviewType() {
return m_contentCell.selectedSubviewType();
SubviewPosition selectedSubviewPosition() {
return m_contentCell.selectedSubviewPosition();
}
void setSelectedSubviewType(SubviewType subviewType) {
m_contentCell.setSelectedSubviewType(subviewType);
void setSelectedSubviewPosition(SubviewPosition subviewPosition) {
m_contentCell.setSelectedSubviewPosition(subviewPosition);
}
void didBecomeFirstResponder() override;
bool handleEvent(Ion::Events::Event event) override;
@@ -46,10 +46,10 @@ private:
MessageTextView * approximateSign() {
return &m_approximateSign;
}
SubviewType selectedSubviewType() {
return m_selectedSubviewType;
SubviewPosition selectedSubviewPosition() {
return m_selectedSubviewPosition;
}
void setSelectedSubviewType(SubviewType subviewType);
void setSelectedSubviewPosition(SubviewPosition subviewPosition);
void layoutSubviews() override;
int numberOfSubviews() const override;
Poincare::Layout layout() const override;
@@ -59,7 +59,7 @@ private:
ExpressionView m_rightExpressionView;
MessageTextView m_approximateSign;
ExpressionView m_leftExpressionView;
SubviewType m_selectedSubviewType;
SubviewPosition m_selectedSubviewPosition;
};
ContentCell m_contentCell;
};