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

[code] Add parentheses after function names in Var.

Browse Source 
Change-Id: I7e3e993d07139c40c6bd59fd5879b3ee091f5127
This commit is contained in:
Léa Saviot
2017-11-30 16:57:47 +01:00
parent 9805f7570e
commit 62fe441b7a
10 changed files with 169 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
apps/code/variable_box_controller.h
View File

@@ -2,8 +2,9 @@
#define CODE_VARIABLE_BOX_CONTROLLER_H
#include <escher.h>
#include "double_buffer_text_cell.h"
#include "menu_controller.h"
#include "script_node.h"
#include "script_node_cell.h"
#include "script_store.h"
namespace Code {
@@ -47,31 +48,6 @@ private:
int indexFromCumulatedHeight(KDCoordinate offsetY) override;
int typeAtLocation(int i, int j) override;
private:
class ScriptNode {
public:
enum class Type {
Function = 0,
Variable = 1
};
ScriptNode() :
m_type(Type::Function), m_name(nullptr), m_scriptIndex(0) {}
static ScriptNode FunctionNode(const char * name, uint16_t scriptIndex) {
return ScriptNode(Type::Function, name, scriptIndex);
}
static ScriptNode VariableNode(const char * name, uint16_t scriptIndex) {
return ScriptNode(Type::Variable, name, scriptIndex);
}
Type type() const { return m_type; }
const char * name() const { return m_name; }
uint16_t scriptIndex() const { return m_scriptIndex; }
private:
ScriptNode(Type type, const char * name, uint16_t scriptIndex) :
m_type(type), m_name(name), m_scriptIndex(scriptIndex) {}
Type m_type;
const char * m_name;
uint16_t m_scriptIndex;
};
constexpr static int k_maxNumberOfDisplayedRows = 6; //240/40
constexpr static int k_leafType = 0;
constexpr static int k_maxScriptNodesCount = 32;
@@ -82,7 +58,7 @@ private:
ScriptStore * m_scriptStore;
TextField * m_textFieldCaller;
TextArea * m_textAreaCaller;
DoubleBufferTextCell m_leafCells[k_maxNumberOfDisplayedRows];
ScriptNodeCell m_leafCells[k_maxNumberOfDisplayedRows];
SelectableTableView m_selectableTableView;
};
ContentViewController m_contentViewController;