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

[apps/settings] Use the new layouts in the Settings app.

Browse Source 
Change-Id: Ic90a78cf58cac28f24b65c5e0c1776c61675bb98
This commit is contained in:
Léa Saviot
2018-01-11 17:50:45 +01:00
parent 1e8935fc2e
commit 735d79a0fc
5 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/settings/sub_controller.cpp
View File

@@ -1,8 +1,7 @@
#include "sub_controller.h"
#include "helpers.h"
#include "../global_preferences.h"
#include "../apps_container.h"
#include "../../poincare/src/layout/baseline_relative_layout.h"
#include "../../poincare/src/layout/string_layout.h"
#include <assert.h>
#include <cmath>
@@ -22,11 +21,8 @@ SubController::SubController(Responder * parentResponder) :
m_cells[i].setAccessoryFontSize(KDText::FontSize::Small);
m_cells[i].setAccessoryTextColor(Palette::GreyDark);
}
const char text[] = {'a','+', Ion::Charset::IComplex, 'b', ' '};
m_complexFormatLayout[0] = new StringLayout(text, sizeof(text));
const char base[] = {'r', Ion::Charset::Exponential};
const char superscript[] = {Ion::Charset::IComplex, Ion::Charset::SmallTheta, ' '};
m_complexFormatLayout[1] = new BaselineRelativeLayout(new StringLayout(base, sizeof(base)), new StringLayout(superscript, sizeof(superscript)), BaselineRelativeLayout::Type::Superscript);
m_complexFormatLayout[0] = Helpers::CartesianComplexFormat(KDText::FontSize::Large);
m_complexFormatLayout[1] = Helpers::PolarComplexFormat(KDText::FontSize::Large);
for (int i = 0; i < 2; i++) {
m_complexFormatCells[i].setExpressionLayout(m_complexFormatLayout[i]);
}