UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 08:47:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/probability] Improve stack title colors

Browse Source 
Change-Id: Ifd6f79030e0ef13c478fae307205c71955ce4593
This commit is contained in:
Émilie Feral
2017-01-31 14:17:21 +01:00
parent d1adce7fea
commit 5e3de6eec9
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
escher/src/stack_view_controller.cpp
View File

@@ -4,14 +4,11 @@ extern "C" {
#include <escher/stack_view_controller.h>
#include <escher/app.h>
StackViewController::ControllerView::ControllerView(bool displayFirstStackHeader, KDColor textColor, KDColor backgroundColor, KDColor separatorColor) :
StackViewController::ControllerView::ControllerView(bool displayFirstStackHeader) :
View(),
m_contentView(nullptr),
m_numberOfStacks(0),
m_displayFirstStackHeader(displayFirstStackHeader),
m_textColor(textColor),
m_backgroundColor(backgroundColor),
m_separatorColor(separatorColor)
m_displayFirstStackHeader(displayFirstStackHeader)
{
}
@@ -21,11 +18,11 @@ void StackViewController::ControllerView::setContentView(View * view) {
markRectAsDirty(bounds());
}
void StackViewController::ControllerView::pushStack(const char * name) {
void StackViewController::ControllerView::pushStack(const char * name, KDColor textColor, KDColor backgroundColor, KDColor separatorColor) {
m_stackViews[m_numberOfStacks].setName(name);
m_stackViews[m_numberOfStacks].setTextColor(m_textColor);
m_stackViews[m_numberOfStacks].setBackgroundColor(m_backgroundColor);
m_stackViews[m_numberOfStacks].setSeparatorColor(m_separatorColor);
m_stackViews[m_numberOfStacks].setTextColor(textColor);
m_stackViews[m_numberOfStacks].setBackgroundColor(backgroundColor);
m_stackViews[m_numberOfStacks].setSeparatorColor(separatorColor);
m_numberOfStacks++;
}
@@ -68,11 +65,15 @@ const char * StackViewController::ControllerView::className() const {
}
#endif
StackViewController::StackViewController(Responder * parentResponder, ViewController * rootViewController, bool displayFirstStackHeader, KDColor textColor, KDColor backgroundColor, KDColor separatorColor) :
StackViewController::StackViewController(Responder * parentResponder, ViewController * rootViewController,
bool displayFirstStackHeader, KDColor textColor, KDColor backgroundColor, KDColor separatorColor) :
ViewController(parentResponder),
m_view(ControllerView(displayFirstStackHeader, textColor, backgroundColor, separatorColor)),
m_view(ControllerView(displayFirstStackHeader)),
m_numberOfChildren(0),
m_rootViewController(rootViewController)
m_rootViewController(rootViewController),
m_textColor(textColor),
m_backgroundColor(backgroundColor),
m_separatorColor(separatorColor)
{
// push(rootViewController);
}
@@ -86,8 +87,8 @@ const char * StackViewController::title() const {
}
}
void StackViewController::push(ViewController * vc) {
m_view.pushStack(vc->title());
void StackViewController::push(ViewController * vc, KDColor textColor, KDColor backgroundColor, KDColor separatorColor) {
m_view.pushStack(vc->title(), textColor, backgroundColor, separatorColor);
m_children[m_numberOfChildren++] = vc;
setupActiveViewController();
}
@@ -123,7 +124,7 @@ bool StackViewController::handleEvent(Ion::Events::Event event) {
View * StackViewController::view() {
if (m_rootViewController != nullptr) {
push(m_rootViewController);
push(m_rootViewController, m_textColor, m_backgroundColor, m_separatorColor);
m_rootViewController = nullptr;
}
return &m_view;