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/code/varbox] Subtitles and basic items are displayed properly

Browse Source
This commit is contained in:
Léa Saviot
2020-04-03 17:52:15 +02:00
committed by Émilie Feral
parent 34a1a8e35f
commit 96d68d6b44
9 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/code/variable_box_controller.cpp
View File

@@ -57,9 +57,8 @@ VariableBoxController::VariableBoxController(ScriptStore * scriptStore) :
m_itemCells[i].setScriptStore(scriptStore);
}
for (int i = 0; i < k_scriptOriginsCount; i++) {
m_subtitleCells[i].setEven(false);
m_subtitleCells[i].setAlignment(0.0f, 0.5f);
m_subtitleCells[i].setMessageFont(KDFont::SmallFont);
m_subtitleCells[i].setBackgroundColor(Palette::WallScreen);
m_subtitleCells[i].setTextColor(Palette::BlueishGrey);
}
}
@@ -131,7 +130,7 @@ void VariableBoxController::willDisplayCellForIndex(HighlightCell * cell, int in
I18n::Message::BuiltinFunctionsAndKeyWords,
I18n::Message::ImportedModulesAndScripts
};
static_cast<EvenOddMessageTextCell *>(cell)->setMessage(subtitleMessages[(int)cellOrigin], Palette::BlueishGrey);
static_cast<MessageTableCell *>(cell)->setMessage(subtitleMessages[(int)cellOrigin]);
}
int VariableBoxController::typeAtLocation(int i, int j) {
@@ -549,7 +548,7 @@ void VariableBoxController::loadCurrentVariablesInScript(const char * scriptCont
}
}
assert(strncmp(tokenInText, name, nameLength) == 0);
addNode(defToken ? ScriptNode::Type::Function : ScriptNode::Type::Variable, NodeOrigin::CurrentScript, tokenInText, nameLength, 1/* TODO LEA*/);
addNode(defToken ? ScriptNode::Type::Function : ScriptNode::Type::Variable, NodeOrigin::CurrentScript, tokenInText, nameLength, ScriptNode::CurrentScriptIndex);
}
}