HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] correct display with highlight ==> maybe rework the highlight

Browse Source
This commit is contained in:
Edouard DUPIN
2013-10-27 20:36:54 +01:00
parent 4d35830559
commit 01692bdd13
14 changed files with 147 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sources/appl/glyphDecoration/GlyphPainting.cpp
View File

@@ -31,7 +31,7 @@ appl::GlyphPainting::~GlyphPainting(void) {
void appl::GlyphPainting::reload(void) {
ejson::Document doc;
if (false == doc.load(m_name)) {
APPL_ERROR("Can not load file : '" << m_name << "'");
APPL_ERROR("Can not load file : '" << m_name << "' = " << etk::FSNode(m_name).getFileSystemName());
return;
}
ejson::Array* baseArray = doc.getArray("ednColor");
@@ -45,11 +45,12 @@ void appl::GlyphPainting::reload(void) {
APPL_DEBUG(" can not get object in 'ednColor' id=" << iii);
continue;
}
etk::UString name = tmpObj->getString("name");
etk::UString background = tmpObj->getString("background");
etk::UString foreground = tmpObj->getString("foreground");
bool italic = tmpObj->getString("italic");
bool bold = tmpObj->getString("bold");
etk::UString name = tmpObj->getStringValue("name", "");
etk::UString background = tmpObj->getStringValue("background", "#FFF0");
etk::UString foreground = tmpObj->getStringValue("foreground", "#000F");
bool italic = tmpObj->getBooleanValue("italic", false);
bool bold = tmpObj->getBooleanValue("bold", false);
APPL_DEBUG("find new color : '" << name << "' fg='" << foreground << "' bg='" << background << "' italic='" << italic << "' bold='" << bold << "'");
bool findElement = false;
for (esize_t jjj=0; jjj<m_list.size(); ++jjj) {
if (m_list[jjj].getName() != name) {