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

Merge branch 'version-11' into f7

Browse Source
This commit is contained in:
Émilie Feral
2019-06-17 15:48:03 -04:00
parent fd4eeada42 1717bafe29
commit 5ac1c27401
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/regression/graph_controller.cpp
View File

@@ -180,6 +180,7 @@ void GraphController::reloadBannerView() {
for (int i = 2; i < m_bannerView.numberOfsubTexts(); i++) {
m_bannerView.subTextAtIndex(i)->setText("");
}
m_bannerView.reload();
return;
}
char coefficientName = 'a';

5
apps/shared/scrollable_exact_approximate_expressions_cell.cpp
View File

@@ -10,6 +10,11 @@ ScrollableExactApproximateExpressionsCell::ScrollableExactApproximateExpressions
{
}
void ScrollableExactApproximateExpressionsCell::setLayouts(Poincare::Layout approximateLayout, Poincare::Layout exactLayout) {
m_view.setLayouts(approximateLayout, exactLayout);
m_view.setSelectedSubviewPosition(ScrollableExactApproximateExpressionsView::SubviewPosition::Left);
}
void ScrollableExactApproximateExpressionsCell::setHighlighted(bool highlight) {
m_view.evenOddCell()->setHighlighted(highlight);
reloadScroll();

4
apps/shared/scrollable_exact_approximate_expressions_cell.h
View File

@@ -9,9 +9,7 @@ namespace Shared {
class ScrollableExactApproximateExpressionsCell : public ::EvenOddCell, public Responder {
public:
ScrollableExactApproximateExpressionsCell(Responder * parentResponder = nullptr);
void setLayouts(Poincare::Layout approximateLayout, Poincare::Layout exactLayout) {
return m_view.setLayouts(approximateLayout, exactLayout);
}
void setLayouts(Poincare::Layout approximateLayout, Poincare::Layout exactLayout);
void setEqualMessage(I18n::Message equalSignMessage) {
return m_view.setEqualMessage(equalSignMessage);
}

1
apps/shared/scrollable_exact_approximate_expressions_view.cpp
View File

@@ -124,6 +124,7 @@ void ScrollableExactApproximateExpressionsView::setLayouts(Poincare::Layout righ
if (updateRightLayout || updateLeftLayout) {
m_contentCell.reloadTextColor();
m_contentCell.layoutSubviews();
reloadScroll();
}
}

2
scripts/config.mak
View File

@@ -3,7 +3,7 @@
PLATFORM ?= device
DEBUG ?= 0
EPSILON_VERSION ?= 11.0.0
EPSILON_VERSION ?= 11.1.0
EPSILON_ONBOARDING_APP ?= 0
# Valid values are "none", "update", "beta"
EPSILON_BOOT_PROMPT ?= none